@@ -1263,15 +1263,18 @@ sub _create_query {

             my $duplicate;

             # Parameter regex

             $sql =~ s/([0-9]):/$1\\:/g;

-            while ($sql =~ /(.*?[^\\]):([$c\.]+)(?:\{(.*?)\})?(.*)/sg) {

+            my $new_sql = '';

+            while ($sql =~ /(.*?[^\\]):([$c\.]+)(?:\{(.*?)\})?(.*)/s) {

                 push @columns, $2;

                 $duplicate = 1 if ++$duplicate{$columns[-1]} > 1;

-                $sql = defined $3 ? "$1$2 $3 ?$4" : "$1?$4";

+                ($new_sql, $sql) = defined $3 ?

+                  ($new_sql . "$1$2 $3 ?", " $4") : ($new_sql . "$1?", " $4");

             }

-            $sql =~ s/\\:/:/g if index($sql, "\\:") != -1;

+            $new_sql .= $sql;

+            $new_sql =~ s/\\:/:/g if index($new_sql, "\\:") != -1;

             # Create query

-            $query = {sql => $sql, columns => \@columns, duplicate => $duplicate};

+            $query = {sql => $new_sql, columns => \@columns, duplicate => $duplicate};

         }

         # Save query to cache

@@ -243,6 +243,7 @@ test 'execute reuse option';

 eval { $dbi->execute("drop table $table1") };

 $dbi->execute($create_table1);

 $reuse = {};

+$DB::single = 1;

 for my $i (1 .. 2) {

   $dbi->insert({$key1 => 1, $key2 => 2}, table => $table1, reuse => $reuse);

 }

@@ -1270,7 +1271,7 @@ $dbi->execute($create_table1);

 $source = "select * from $table1 where $key1 = :$key1 and $key2 = :$key2";

 $dbi->execute($source, {}, query => 1);

 is_deeply($dbi->{_cached}->{$source}, 

-          {sql => " select * from $table1 where $key1 = ? and $key2 = ?", columns => [$key1, $key2], tables => []}, "cache");

+          {sql => " select * from $table1 where $key1 = ?  and $key2 = ? ", columns => [$key1, $key2], tables => []}, "cache");

 eval { $dbi->execute("drop table $table1") };

 $dbi->execute($create_table1);