X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FStorage%2FDBI%2FNoBindVars.pm;h=80f367d5435535b5dc89106c9276810bf81a115c;hb=9c0df5f32b68e23c670c89ce6cdbff60b4bd0ed0;hp=2877ee270b41d4afac88389bceb1be5615890c14;hpb=672c8df5fcf20b4c0894ccd3763702522a9f829d;p=dbsrgits%2FDBIx-Class.git

diff --git a/lib/DBIx/Class/Storage/DBI/NoBindVars.pm b/lib/DBIx/Class/Storage/DBI/NoBindVars.pm
index 2877ee2..80f367d 100644
--- a/lib/DBIx/Class/Storage/DBI/NoBindVars.pm
+++ b/lib/DBIx/Class/Storage/DBI/NoBindVars.pm
@@ -25,7 +25,7 @@ We can't cache very effectively without bind variables, so force the C<disable_s
 
 sub connect_info {
     my $self = shift;
-    my $retval = shift->next::method(@_);
+    my $retval = $self->next::method(@_);
     $self->disable_sth_caching(1);
     $retval;
 }
@@ -38,11 +38,25 @@ Manually subs in the values for the usual C<?> placeholders.
 
 sub _prep_for_execute {
   my $self = shift;
-  my ($sql, @bind) = $self->next::method(@_);
+  my ($sql, $bind) = $self->next::method(@_);
 
-  $sql =~ s/\?/$self->_dbh->quote(shift(@bind))/eg;
+  # stringify args, quote via $dbh, and manually insert
 
-  return ($sql);
+  my @sql_part = split /\?/, $sql;
+  my $new_sql;
+
+  foreach my $bound (@$bind) {
+    shift @$bound;
+    foreach my $data (@$bound) {
+        if(ref $data) {
+            $data = ''.$data;
+        }
+        $new_sql .= shift(@sql_part) . $self->_dbh->quote($data);
+    }
+  }
+  $new_sql .= join '', @sql_part;
+
+  return ($new_sql);
 }
 
 =head1 AUTHORS