X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FStorage%2FDBI%2FSybase%2FNoBindVars.pm;h=b918682965c68d3d9cb51e91b5b200173f2c50d8;hb=8c4b6c50e873a2b5993d1bfe0f40763d994b7da4;hp=c815f673647714a7658a07728fbd945aacb9b5bb;hpb=0c4499731cc668d60baede9e2c10424103610dd7;p=dbsrgits%2FDBIx-Class-Historic.git

diff --git a/lib/DBIx/Class/Storage/DBI/Sybase/NoBindVars.pm b/lib/DBIx/Class/Storage/DBI/Sybase/NoBindVars.pm
index c815f67..b918682 100644
--- a/lib/DBIx/Class/Storage/DBI/Sybase/NoBindVars.pm
+++ b/lib/DBIx/Class/Storage/DBI/Sybase/NoBindVars.pm
@@ -8,6 +8,11 @@ use base qw/
 use List::Util ();
 use Scalar::Util ();
 
+sub _rebless {
+  my $self = shift;
+  $self->disable_sth_caching(1);
+}
+
 sub _dbh_last_insert_id {
   my ($self, $dbh, $source, $col) = @_;
 
@@ -18,27 +23,36 @@ 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_value {
   my $self = shift;
   my ($type, $value) = @_;
 
-  return $self->next::method(@_) if not defined $value;
+  return $self->next::method(@_) if not defined $value or not defined $type;
 
   if (my $key = List::Util::first { $type =~ /$_/i } keys %noquote) {
     return 0 if $noquote{$key}->($value);
+  } elsif($self->is_datatype_numeric($type) && $number->($value)) {
+    return 0;
   }
 
+## try to guess based on value
+#  elsif (not $type) {
+#    return 0 if $number->($value) || $noquote->{money}->($value);
+#  }
+
   return $self->next::method(@_);
 }
 
@@ -52,10 +66,18 @@ without placeholder support
 =head1 DESCRIPTION
 
 If you're using this driver than your version of Sybase does not support
-placeholders. You can check with:
+placeholders, or your version of L<DBD::Sybase> was compiled with FreeTDS rather
+than the Sybase OpenClient libraries. You can check with:
 
   $dbh->{syb_dynamic_supported}
 
+To see if you are using FreeTDS, run:
+
+  perl -MDBD::Sybase -le 'print grep /Sybase\./, @DynaLoader::dl_shared_objects' | xargs ldd
+
+If you see C<libct.so> or similar, rather than C<libsybct.so> then you are using
+FreeTDS.
+
 You can also enable this driver explicitly using:
 
   my $schema = SchemaClass->clone;