Merge 'trunk' into 'replication_dedux'

[dbsrgits/DBIx-Class.git] / lib / DBIx / Class / Storage / DBI / NoBindVars.pm

diff --git a/lib/DBIx/Class/Storage/DBI/NoBindVars.pm b/lib/DBIx/Class/Storage/DBI/NoBindVars.pm
index c5fa9af..80f367d 100644 (file)
--- a/lib/DBIx/Class/Storage/DBI/NoBindVars.pm
+++ b/lib/DBIx/Class/Storage/DBI/NoBindVars.pm
@@ -42,17 +42,21 @@ sub _prep_for_execute {
 
   # stringify args, quote via $dbh, and manually insert
 
+  my @sql_part = split /\?/, $sql;
+  my $new_sql;
+
   foreach my $bound (@$bind) {
     shift @$bound;
     foreach my $data (@$bound) {
         if(ref $data) {
             $data = ''.$data;
         }
-        $sql =~ s/\?/$self->_dbh->quote($data)/e;
+        $new_sql .= shift(@sql_part) . $self->_dbh->quote($data);
     }
   }
+  $new_sql .= join '', @sql_part;
 
-  return ($sql);
+  return ($new_sql);
 }
 
 =head1 AUTHORS