X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FStorage%2FDBI%2FNoBindVars.pm;h=71de5b97ee8f7da60cccdb2e286b621851eb9d98;hb=0e773352a;hp=637e41140f833d154f009a4fce47a048a775c753;hpb=6636ad53c7480e9546c2a0a3ecaa5a807874c819;p=dbsrgits%2FDBIx-Class.git

diff --git a/lib/DBIx/Class/Storage/DBI/NoBindVars.pm b/lib/DBIx/Class/Storage/DBI/NoBindVars.pm
index 637e411..71de5b9 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 
 
@@ -41,69 +40,75 @@ Manually subs in the values for the usual C<?> placeholders.
 sub _prep_for_execute {
   my $self = shift;
 
-  my ($op, $extra_bind, $ident, $args) = @_;
-
   my ($sql, $bind) = $self->next::method(@_);
 
-  # stringify args, quote via $dbh, and manually insert
+  # stringify bind args, quote via $dbh, and manually insert
+  #my ($op, $ident, $args) = @_;
+  my $ident = $_[1];
 
   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} || '.';
-    my $quote_char = $self->_sql_maker_opts->{quote_char} || '';
-    $quote_char    = join '', @$quote_char if ref $quote_char eq 'ARRAY';
+  my $col_info = $self->_resolve_column_info(
+    $ident, [ map { $_->[0]{dbic_colname} || () } @$bind ]
+  );
 
-    $col =~ s/[\Q${quote_char}\E]//g if $quote_char;
-    $col =~ s/^([^\Q${name_sep}\E]*)\Q${name_sep}\E//;
-    my $alias = $1 || 'me';
+  for (@$bind) {
+    my $datatype = $col_info->{ $_->[0]{dbic_colname}||'' }{data_type};
 
-    my $rsrc = $alias2src->{$alias};
+    my $data = (ref $_->[1]) ? "$_->[1]" : $_->[1]; # always stringify
 
-    my $datatype = $rsrc && $rsrc->column_info($col)->{data_type};
+    $data = $self->_prep_interpolated_value($datatype, $data)
+      if $datatype;
 
-    foreach my $data (@$bound) {
-        $data = ''.$data if ref $data;
+    $data = $self->_get_dbh->quote($data)
+      unless $self->interpolate_unquoted($datatype, $data);
 
-        $data = $self->_dbh->quote($data) if $self->should_quote($datatype, $data);
-
-        $new_sql .= shift(@sql_part) . $data;
-    }
+    $new_sql .= shift(@sql_part) . $data;
   }
+
   $new_sql .= join '', @sql_part;
 
   return ($new_sql, []);
 }
 
-=head2 should_quote
-                                
+=head2 interpolate_unquoted
+
 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
+value is interpreted as: true - do not quote, false - do 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!!!                     
-                                
+columns). The default method always returns false (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 { 1 }
 
-=head1 AUTHORS
+=cut
 
-Brandon Black <blblack@gmail.com>
+sub interpolate_unquoted {
+  #my ($self, $datatype, $value) = @_;
+  return 0;
+}
+
+=head2 _prep_interpolated_value
+
+Given a datatype and the value to be inserted directly into a SQL query, returns
+the necessary string to represent that value (by e.g. adding a '$' sign)
+
+=cut
+
+sub _prep_interpolated_value {
+  #my ($self, $datatype, $value) = @_;
+  return $_[2];
+}
+
+=head1 AUTHORS
 
-Trym Skaar <trym@tryms.no>
+See L<DBIx::Class/CONTRIBUTORS>
 
 =head1 LICENSE