X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FStorage%2FDBI%2FNoBindVars.pm;h=126b9de2bd28327ee1ceefa19f04626dd7906d54;hb=bc144884abdf828846ecc29122647fdaf1ac2487;hp=3256846f974c5bd7969a4aeb789f88d407dd5894;hpb=bbdc039bb73622702cbaaa25890349e3f2664fbf;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 3256846..126b9de 100644
--- a/lib/DBIx/Class/Storage/DBI/NoBindVars.pm
+++ b/lib/DBIx/Class/Storage/DBI/NoBindVars.pm
@@ -4,8 +4,7 @@ use strict;
 use warnings;
 
 use base 'DBIx::Class::Storage::DBI';
-use Scalar::Util ();
-use Carp::Clan qw/^DBIx::Class/;
+use mro 'c3';
 
 =head1 NAME 
 
@@ -50,26 +49,23 @@ sub _prep_for_execute {
   my @sql_part = split /\?/, $sql;
   my $new_sql;
 
-  my $alias2src = $self->_resolve_ident_sources($ident);
+  my $col_info = $self->_resolve_column_info($ident, [ map $_->[0], @$bind ]);
 
   foreach my $bound (@$bind) {
     my $col = shift @$bound;
 
-    my $name_sep = $self->_sql_maker_opts->{name_sep} || '.';
+    my $datatype = $col_info->{$col}{data_type};
 
-    $col =~ s/^([^\Q${name_sep}\E]*)\Q${name_sep}\E//;
-    my $alias = $1 || 'me';
+    foreach my $data (@$bound) {
+      $data = ''.$data if ref $data;
 
-    my $rsrc = $alias2src->{$alias};
+      $data = $self->transform_unbound_value($datatype, $data)
+        if $datatype;
 
-    my $datatype = $rsrc && $rsrc->column_info($col)->{data_type};
+      $data = $self->_dbh->quote($data)
+        if (!$datatype || $self->should_quote_value($datatype, $data));
 
-    foreach my $data (@$bound) {
-        if(ref $data) {
-            $data = ''.$data;
-        }
-        $data = $self->_dbh->quote($data) if $self->should_quote_data_type($datatype, $data);
-        $new_sql .= shift(@sql_part) . $data;
+      $new_sql .= shift(@sql_part) . $data;
     }
   }
   $new_sql .= join '', @sql_part;
@@ -77,8 +73,8 @@ sub _prep_for_execute {
   return ($new_sql, []);
 }
 
-=head2 should_quote_data_type   
-                                
+=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
@@ -86,15 +82,24 @@ 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_data_type { 1 }
+
+sub should_quote_value { 1 }
+
+=head2 transform_unbound_value
+
+Given a datatype and the value to be inserted directly into a SQL query, returns
+the necessary SQL fragment to represent that value.
+
+=cut
+
+sub transform_unbound_value { $_[2] }
 
 =head1 AUTHORS