cache rsrc properly in NoBindVars, return undef if no rsrc

[dbsrgits/DBIx-Class-Historic.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 f3a46f6..d0fea5e 100644 (file)
--- a/lib/DBIx/Class/Storage/DBI/Sybase/NoBindVars.pm
+++ b/lib/DBIx/Class/Storage/DBI/Sybase/NoBindVars.pm
@@ -37,14 +37,14 @@ sub should_quote_data_type {
 
   return $self->next::method(@_) if not defined $value;
 
-## this is the correct method, but we have no type yet
-#  if (my $key = List::Util::first { $type =~ /$_/i } keys %noquote) {
-#    return 0 if $noquote{$key}->($value);
-#  }
-
-# temporary hack
-  return 0 if Scalar::Util::looks_like_number($value) ||
-    ($value =~ /^\$(\S*)\z/ && Scalar::Util::looks_like_number($1));
+  $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(@_);
 }