use _resolve_column_info in NoBindVars

[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 d58ccae..c3ba153 100644 (file)
--- 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,21 +49,20 @@ sub _prep_for_execute {
   my @sql_part = split /\?/, $sql;
   my $new_sql;
 
+  my $col_info = $self->_resolve_column_info($ident, [ map $_->[0], @$bind ]);
+
   foreach my $bound (@$bind) {
     my $col = shift @$bound;
 
-    $col =~ s/^([^.]*)\.//;
-    my $alias = $1 || 'me';
-
-    my $datatype = $self->_resolve_ident_sources($ident)->{$alias}
-        ->column_info($col)->{data_type};
+    my $datatype = $col_info->{$col}{data_type};
 
     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;
+      $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;
@@ -72,7 +70,7 @@ 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
@@ -89,7 +87,7 @@ columns). The default method always returns true (do quote).
                                 
 =cut                            
                                 
-sub should_quote_data_type { 1 }
+sub should_quote_value { 1 }
 
 =head1 AUTHORS