[Bast-commits] r6254 - DBIx-Class/0.08/trunk/lib/DBIx/Class/Storage/DBI

[ribasushi at dev.catalyst.perl.org]

Author: ribasushi
Date: 2009-05-14 10:12:44 +0000 (Thu, 14 May 2009)
New Revision: 6254

Modified:
   DBIx-Class/0.08/trunk/lib/DBIx/Class/Storage/DBI/Cursor.pm
   DBIx-Class/0.08/trunk/lib/DBIx/Class/Storage/DBI/NoBindVars.pm
Log:
Sometimes _prepare_for_execute may not return a set of bind vars - guard against that

Modified: DBIx-Class/0.08/trunk/lib/DBIx/Class/Storage/DBI/Cursor.pm
===================================================================
--- DBIx-Class/0.08/trunk/lib/DBIx/Class/Storage/DBI/Cursor.pm	2009-05-14 00:15:48 UTC (rev 6253)
+++ DBIx-Class/0.08/trunk/lib/DBIx/Class/Storage/DBI/Cursor.pm	2009-05-14 10:12:44 UTC (rev 6254)
@@ -72,7 +72,7 @@
 
   my @args = $storage->_select_args(@{$self->{args}});
   my ($sql, $bind)  = $storage->_prep_for_execute(@args[0 .. 2], [@args[4 .. $#args]]);
-  return \[ "($sql)", @$bind ];
+  return \[ "($sql)", @{ $bind || [] }];
 }
 
 =head2 next

Modified: DBIx-Class/0.08/trunk/lib/DBIx/Class/Storage/DBI/NoBindVars.pm
===================================================================
--- DBIx-Class/0.08/trunk/lib/DBIx/Class/Storage/DBI/NoBindVars.pm	2009-05-14 00:15:48 UTC (rev 6253)
+++ DBIx-Class/0.08/trunk/lib/DBIx/Class/Storage/DBI/NoBindVars.pm	2009-05-14 10:12:44 UTC (rev 6254)
@@ -61,7 +61,7 @@
   }
   $new_sql .= join '', @sql_part;
 
-  return ($new_sql);
+  return ($new_sql, []);
 }
 
 =head1 AUTHORS