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=84f97107323065f3be493552cd70ae9d976a4f80;hp=5053bae30d6c1025113dd5579043a3aa110f758b;hpb=28cea3aa579791963ea117bdbfdbd4ee3e948555;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 5053bae..32908ee 100644
--- a/lib/DBIx/Class/Storage/DBI/Sybase/NoBindVars.pm
+++ b/lib/DBIx/Class/Storage/DBI/Sybase/NoBindVars.pm
@@ -1,20 +1,21 @@
 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 _rebless {
+sub _init {
   my $self = shift;
   $self->disable_sth_caching(1);
+  $self->_identity_method('@@IDENTITY');
+  $self->next::method (@_);
 }
 
-# this works when NOT using placeholders
-sub _fetch_identity_sql { 'SELECT @@IDENTITY' }
+sub _fetch_identity_sql { 'SELECT ' . $_[0]->_identity_method }
 
 my $number = sub { Scalar::Util::looks_like_number($_[0]) };
 
@@ -31,26 +32,33 @@ my %noquote = (
     numeric => $decimal,
 );
 
-sub should_quote_value {
+sub interpolate_unquoted {
   my $self = shift;
   my ($type, $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;
+    return 1 if $noquote{$key}->($value);
+  }
+  elsif ($self->is_datatype_numeric($type) && $number->($value)) {
+    return 1;
   }
-
-## try to guess based on value
-#  elsif (not $type) {
-#    return 0 if $number->($value) || $noquote->{money}->($value);
-#  }
 
   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
@@ -60,17 +68,8 @@ without placeholder support
 
 =head1 DESCRIPTION
 
-If you're using this driver than your version of Sybase does not support
-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 -MDBI -le 'my $dbh = DBI->connect($dsn, $user, $pass); print $dbh->{syb_oc_version}'
-
-You will get a warning on startup if you're using FreeTDS in any case.
+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:
 
@@ -83,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.