Merge 'trunk' into 'sybase'

[dbsrgits/DBIx-Class-Historic.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..511b0ad 100644 (file)
--- a/lib/DBIx/Class/Storage/DBI/NoBindVars.pm
+++ b/lib/DBIx/Class/Storage/DBI/NoBindVars.pm
@@ -4,6 +4,7 @@ use strict;
 use warnings;
 
 use base 'DBIx::Class::Storage::DBI';
+use mro 'c3';
 
 =head1 NAME 
 
@@ -25,7 +26,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 +39,63 @@ 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, $args) = @_;
 
-  return ($sql);
+  my ($sql, $bind) = $self->next::method(@_);
+
+  # stringify args, quote via $dbh, and manually insert
+
+  my @sql_part = split /\?/, $sql;
+  my $new_sql;
+
+  my $alias2src = $self->_resolve_ident_sources($ident);
+
+  foreach my $bound (@$bind) {
+    my $col = shift @$bound;
+
+    my $name_sep   = $self->_sql_maker_opts->{name_sep} || '.';
+
+    $col =~ s/^([^\Q${name_sep}\E]*)\Q${name_sep}\E//;
+    my $alias = $1 || 'me';
+
+    my $rsrc = $alias2src->{$alias};
+
+    my $datatype = $rsrc && $rsrc->column_info($col)->{data_type};
+
+    foreach my $data (@$bound) {
+      $data = ''.$data if ref $data;
+
+      $data = $self->_dbh->quote($data)
+        if $self->should_quote_value($datatype, $data);
+
+      $new_sql .= shift(@sql_part) . $data;
+    }
+  }
+  $new_sql .= join '', @sql_part;
+
+  return ($new_sql, []);
 }
 
+=head2 should_quote_value
+                                
+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 arguments
+are the current column data type and the actual bind value. 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).
+                                
+ WARNING!!!                     
+                                
+ Always validate that the bind-value is valid for the current datatype.
+ Otherwise you may very well open the door to SQL injection attacks.
+                                
+=cut                            
+                                
+sub should_quote_value { 1 }
+
 =head1 AUTHORS
 
 Brandon Black <blblack@gmail.com>