Fix some should_quote_data_type problems

[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 b965053..9f81caf 100644 (file)
--- 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,13 +38,47 @@ 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 $do_quote = $self->should_quote_data_type($col);
+    foreach my $data (@$bound) {
+        if(ref $data) {
+            $data = ''.$data;
+        }
+        $data = $self->_dbh->quote($data) if $do_quote;
+        $new_sql .= shift(@sql_part) . $data;
+    }
+  }
+  $new_sql .= join '', @sql_part;
+
+  return ($new_sql);
 }
 
+=head2 should_quote_data_type
+
+This method is called by L</_prep_for_execute> for every column in
+order to determine if its value should be quoted or not. The sole
+argument is the current column data type, and the return value is
+interpreted as: true - do quote, false - do not quote. You should
+override this in you Storage::DBI::<database> subclass, if your
+RDBMS does not like quotes around certain datatypes (e.g. Sybase
+and integer columns). The default method always returns true (do
+quote).
+
+=cut
+
+sub should_quote_data_type { 1 }
+
 =head1 AUTHORS
 
 Brandon Black <blblack@gmail.com>