Merge 'trunk' into 'handle_all_storage_methods_in_replicated'

[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 030ad9f..9f84702 100644 (file)
--- a/lib/DBIx/Class/Storage/DBI/NoBindVars.pm
+++ b/lib/DBIx/Class/Storage/DBI/NoBindVars.pm
@@ -59,11 +59,11 @@ sub _prep_for_execute {
     foreach my $data (@$bound) {
       $data = ''.$data if ref $data;
 
-      $data = $self->_prep_bind_value($datatype, $data)
+      $data = $self->_prep_interpolated_value($datatype, $data)
         if $datatype;
 
       $data = $self->_dbh->quote($data)
-        if (!$datatype || $self->should_quote_value($datatype, $data));
+        unless $self->interpolate_unquoted($datatype, $data);
 
       $new_sql .= shift(@sql_part) . $data;
     }
@@ -73,15 +73,15 @@ sub _prep_for_execute {
   return ($new_sql, []);
 }
 
-=head2 should_quote_value
+=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).
+columns). The default method always returns false (do quote).
 
  WARNING!!!
 
@@ -90,19 +90,19 @@ columns). The default method always returns true (do quote).
 
 =cut
 
-sub should_quote_value {
+sub interpolate_unquoted {
   #my ($self, $datatype, $value) = @_;
-  return 1;
+  return 0;
 }
 
-=head2 _prep_bind_value
+=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_bind_value {
+sub _prep_interpolated_value {
   #my ($self, $datatype, $value) = @_;
   return $_[2];
 }