[Bast-commits] r6519 - in DBIx-Class/0.08/branches/sybase/lib/DBIx/Class/Storage/DBI: . Sybase

[caelum at dev.catalyst.perl.org]

Author: caelum
Date: 2009-06-05 14:55:41 +0000 (Fri, 05 Jun 2009)
New Revision: 6519

Modified:
   DBIx-Class/0.08/branches/sybase/lib/DBIx/Class/Storage/DBI/NoBindVars.pm
   DBIx-Class/0.08/branches/sybase/lib/DBIx/Class/Storage/DBI/Sybase/NoBindVars.pm
Log:
update sybase types which shouldn't be quoted

Modified: DBIx-Class/0.08/branches/sybase/lib/DBIx/Class/Storage/DBI/NoBindVars.pm
===================================================================
--- DBIx-Class/0.08/branches/sybase/lib/DBIx/Class/Storage/DBI/NoBindVars.pm	2009-06-05 14:28:58 UTC (rev 6518)
+++ DBIx-Class/0.08/branches/sybase/lib/DBIx/Class/Storage/DBI/NoBindVars.pm	2009-06-05 14:55:41 UTC (rev 6519)
@@ -41,7 +41,7 @@
 sub _prep_for_execute {
   my $self = shift;
 
-  my ($op, $extra_bind, $ident, $rsrc) = @_;
+  my ($op, $extra_bind, $ident, $args) = @_;
 
   my ($sql, $bind) = $self->next::method(@_);
 

Modified: DBIx-Class/0.08/branches/sybase/lib/DBIx/Class/Storage/DBI/Sybase/NoBindVars.pm
===================================================================
--- DBIx-Class/0.08/branches/sybase/lib/DBIx/Class/Storage/DBI/Sybase/NoBindVars.pm	2009-06-05 14:28:58 UTC (rev 6518)
+++ DBIx-Class/0.08/branches/sybase/lib/DBIx/Class/Storage/DBI/Sybase/NoBindVars.pm	2009-06-05 14:55:41 UTC (rev 6519)
@@ -6,6 +6,7 @@
   DBIx::Class::Storage::DBI::Sybase
 /;
 use List::Util ();
+use Scalar::Util ();
 
 sub _dbh_last_insert_id {
   my ($self, $dbh, $source, $col) = @_;
@@ -15,9 +16,17 @@
   return ($dbh->selectrow_array('select @@identity'))[0];
 }
 
+my $number = sub { Scalar::Util::looks_like_number($_[0]) };
+
 my %noquote = (
-    int => sub { /^ -? \d+ \z/x },
-    # TODO maybe need to add float/real/etc
+    int => sub { $_[0] =~ /^ -? \d+ \z/x },
+    bit => => sub { $_[0] =~ /^[01]\z/ },
+    money => sub { $_[0] =~ /^\$ \d+ (\.\d*)? \z/x },
+    float => $number,
+    real => $number,
+    double => $number,
+    decimal => $number,
+    numeric => $number,
 );
 
 sub should_quote_data_type {
@@ -26,9 +35,8 @@
 
   return $self->next::method(@_) if not defined $value;
 
-  if (my $key = List::Util::first { $type =~ /^$_/i } keys %noquote) {
-    local $_ = $value;
-    return 0 if $noquote{$key}->();
+  if (my $key = List::Util::first { $type =~ /$_/i } keys %noquote) {
+    return 0 if $noquote{$key}->($value);
   }
 
   return $self->next::method(@_);