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

diff --git a/lib/DBIx/Class/Storage/DBI/Sybase/NoBindVars.pm b/lib/DBIx/Class/Storage/DBI/Sybase/NoBindVars.pm
index c815f67..32908ee 100644
--- a/lib/DBIx/Class/Storage/DBI/Sybase/NoBindVars.pm
+++ b/lib/DBIx/Class/Storage/DBI/Sybase/NoBindVars.pm
@@ -1,47 +1,64 @@
 package DBIx::Class::Storage::DBI::Sybase::NoBindVars;
 
-use Class::C3;
 use base qw/
   DBIx::Class::Storage::DBI::NoBindVars
   DBIx::Class::Storage::DBI::Sybase
 /;
+use mro 'c3';
 use List::Util ();
 use Scalar::Util ();
 
-sub _dbh_last_insert_id {
-  my ($self, $dbh, $source, $col) = @_;
-
-  # @@identity works only if not using placeholders
-  # Should this query be cached?
-  return ($dbh->selectrow_array('select @@identity'))[0];
+sub _init {
+  my $self = shift;
+  $self->disable_sth_caching(1);
+  $self->_identity_method('@@IDENTITY');
+  $self->next::method (@_);
 }
 
+sub _fetch_identity_sql { 'SELECT ' . $_[0]->_identity_method }
+
 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 interpolate_unquoted {
   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);
+    return 1 if $noquote{$key}->($value);
+  }
+  elsif ($self->is_datatype_numeric($type) && $number->($value)) {
+    return 1;
   }
 
   return $self->next::method(@_);
 }
 
+sub _prep_interpolated_value {
+  my ($self, $type, $value) = @_;
+
+  if ($type =~ /money/i && defined $value) {
+    # change a ^ not followed by \$ to a \$
+    $value =~ s/^ (?! \$) /\$/x;
+  }
+
+  return $value;
+}
+
 1;
 
 =head1 NAME
@@ -51,10 +68,8 @@ without placeholder support
 
 =head1 DESCRIPTION
 
-If you're using this driver than your version of Sybase does not support
-placeholders. You can check with:
-
-  $dbh->{syb_dynamic_supported}
+If you're using this driver than your version of Sybase, or the libraries you
+use to connect to it, do not support placeholders.
 
 You can also enable this driver explicitly using:
 
@@ -67,7 +82,7 @@ $sth->execute >> for details on the pros and cons of using placeholders.
 
 One advantage of not using placeholders is that C<select @@identity> will work
 for obtainging the last insert id of an C<IDENTITY> column, instead of having to
-do C<select max(col)> as the base Sybase driver does.
+do C<select max(col)> in a transaction as the base Sybase driver does.
 
 When using this driver, bind variables will be interpolated (properly quoted of
 course) into the SQL query itself, without using placeholders.