cleanups

[dbsrgits/DBIx-Class.git] / lib / DBIx / Class / Storage / DBI / Sybase / NoBindVars.pm

diff --git a/lib/DBIx/Class/Storage/DBI/Sybase/NoBindVars.pm b/lib/DBIx/Class/Storage/DBI/Sybase/NoBindVars.pm
index 82d05dc..8f80c3d 100644 (file)
--- a/lib/DBIx/Class/Storage/DBI/Sybase/NoBindVars.pm
+++ b/lib/DBIx/Class/Storage/DBI/Sybase/NoBindVars.pm
@@ -6,6 +6,7 @@ use base qw/
   DBIx::Class::Storage::DBI::Sybase
 /;
 use List::Util ();
+use Scalar::Util ();
 
 sub _dbh_last_insert_id {
   my ($self, $dbh, $source, $col) = @_;
@@ -15,20 +16,34 @@ sub _dbh_last_insert_id {
   return ($dbh->selectrow_array('select @@identity'))[0];
 }
 
+my $number = sub { Scalar::Util::looks_like_number($_[0]) };
+
+my $decimal = sub { $_[0] =~ /^ [-+]? \d+ (?:\.\d*)? \z/x };
+
 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 => $decimal,
+    numeric => $decimal,
 );
 
-sub should_quote_data_type {
+sub should_quote {
   my $self = shift;
   my ($type, $value) = @_;
 
   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}->();
+  $type ||= '';
+
+  if (my $key = List::Util::first { $type =~ /$_/i } keys %noquote) {
+    return 0 if $noquote{$key}->($value);
+  } elsif (not $type) {
+# try to guess based on value
+    return 0 if $number->($value) || $noquote->{money}->($value);
   }
 
   return $self->next::method(@_);