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 c815f67..8f80c3d 100644 (file)
--- a/lib/DBIx/Class/Storage/DBI/Sybase/NoBindVars.pm
+++ b/lib/DBIx/Class/Storage/DBI/Sybase/NoBindVars.pm
@@ -18,25 +18,32 @@ sub _dbh_last_insert_id {
 
 my $number = sub { Scalar::Util::looks_like_number($_[0]) };
 
+my $decimal = sub { $_[0] =~ /^ [-+]? \d+ (?:\.\d*)? \z/x };
+
 my %noquote = (
-    int => sub { $_[0] =~ /^ -? \d+ \z/x },
+    int => sub { $_[0] =~ /^ [-+]? \d+ \z/x },
     bit => => sub { $_[0] =~ /^[01]\z/ },
-    money => sub { $_[0] =~ /^\$ \d+ (\.\d*)? \z/x },
+    money => sub { $_[0] =~ /^\$ \d+ (?:\.\d*)? \z/x },
     float => $number,
     real => $number,
     double => $number,
-    decimal => $number,
-    numeric => $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;
 
+  $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(@_);