X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FStorage%2FDBI%2FNoBindVars.pm;h=7027ad6350df540c538fb2c39da45eb018623d1e;hb=43919f423fba30ae065ba4617a2e1f9e5aae1640;hp=2ab0799797bed4a6e82618e7287f7bfb543d83fe;hpb=d5130dd2ecbb3a4d31393332f6b4e419f251f427;p=dbsrgits%2FDBIx-Class-Historic.git

diff --git a/lib/DBIx/Class/Storage/DBI/NoBindVars.pm b/lib/DBIx/Class/Storage/DBI/NoBindVars.pm
index 2ab0799..7027ad6 100644
--- a/lib/DBIx/Class/Storage/DBI/NoBindVars.pm
+++ b/lib/DBIx/Class/Storage/DBI/NoBindVars.pm
@@ -17,15 +17,17 @@ well, as is the case with L<DBD::Sybase>
 
 =head1 METHODS
 
-=head2 sth
+=head2 connect_info
 
-Uses C<prepare> instead of the usual C<prepare_cached>, seeing as we can't cache very effectively without bind variables.
+We can't cache very effectively without bind variables, so force the C<disable_sth_caching> setting to be turned on when the connect info is set.
 
 =cut
 
-sub _dbh_sth {
-  my ($self, $dbh, $sql) = @_;
-  $dbh->prepare($sql);
+sub connect_info {
+    my $self = shift;
+    my $retval = $self->next::method(@_);
+    $self->disable_sth_caching(1);
+    $retval;
 }
 
 =head2 _prep_for_execute
@@ -36,11 +38,30 @@ Manually subs in the values for the usual C<?> placeholders.
 
 sub _prep_for_execute {
   my $self = shift;
-  my ($sql, @bind) = $self->next::method(@_);
 
-  $sql =~ s/\?/$self->_dbh->quote($_)/e for (@bind);
+  my ($op, $extra_bind, $ident) = @_;
 
-  return ($sql);
+  my ($sql, $bind) = $self->next::method(@_);
+
+  # stringify args, quote via $dbh, and manually insert
+
+  my @sql_part = split /\?/, $sql;
+  my $new_sql;
+
+  foreach my $bound (@$bind) {
+    my $col = shift @$bound;
+    my $datatype = 'FIXME!!!';
+    foreach my $data (@$bound) {
+        if(ref $data) {
+            $data = ''.$data;
+        }
+        $data = $self->_dbh->quote($data);
+        $new_sql .= shift(@sql_part) . $data;
+    }
+  }
+  $new_sql .= join '', @sql_part;
+
+  return ($new_sql, []);
 }
 
 =head1 AUTHORS