Parameterize pagination

[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 71de5b9..85810cc 100644 (file)
--- a/lib/DBIx/Class/Storage/DBI/NoBindVars.pm
+++ b/lib/DBIx/Class/Storage/DBI/NoBindVars.pm
@@ -6,7 +6,12 @@ use warnings;
 use base 'DBIx::Class::Storage::DBI';
 use mro 'c3';
 
-=head1 NAME 
+use DBIx::Class::SQLMaker::LimitDialects;
+use List::Util qw/first/;
+
+use namespace::clean;
+
+=head1 NAME
 
 DBIx::Class::Storage::DBI::NoBindVars - Sometime DBDs have poor to no support for bind variables
 
@@ -49,20 +54,16 @@ sub _prep_for_execute {
   my @sql_part = split /\?/, $sql;
   my $new_sql;
 
-  my $col_info = $self->_resolve_column_info(
-    $ident, [ map { $_->[0]{dbic_colname} || () } @$bind ]
-  );
-
   for (@$bind) {
-    my $datatype = $col_info->{ $_->[0]{dbic_colname}||'' }{data_type};
+    my $data = (ref $_->[1]) ? "$_->[1]" : $_->[1]; # always stringify, array types are currently not supported
 
-    my $data = (ref $_->[1]) ? "$_->[1]" : $_->[1]; # always stringify
+    my $datatype = $_->[0]{sqlt_datatype};
 
     $data = $self->_prep_interpolated_value($datatype, $data)
       if $datatype;
 
     $data = $self->_get_dbh->quote($data)
-      unless $self->interpolate_unquoted($datatype, $data);
+      unless ($datatype and $self->interpolate_unquoted($datatype, $data) );
 
     $new_sql .= shift(@sql_part) . $data;
   }
@@ -80,7 +81,8 @@ are the current column data type and the actual bind value. The return
 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 false (do quote).
+columns). The default method returns false, except for integer datatypes
+paired with values containing nothing but digits.
 
  WARNING!!!
 
@@ -91,6 +93,17 @@ columns). The default method always returns false (do quote).
 
 sub interpolate_unquoted {
   #my ($self, $datatype, $value) = @_;
+
+  return 1 if (
+    defined $_[2]
+      and
+    $_[1]
+      and
+    $_[2] !~ /\D/
+      and
+    $_[1] =~ /int(?:eger)? | (?:tiny|small|medium|big)int/ix
+  );
+
   return 0;
 }