X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FStorage%2FDBI%2FSybase%2FNoBindVars.pm;h=7b59d0a95f136389b18249b0cce81b1f4336043a;hb=166c656193b56e08b472c675e92b9076aac03a53;hp=b918682965c68d3d9cb51e91b5b200173f2c50d8;hpb=8c4b6c50e873a2b5993d1bfe0f40763d994b7da4;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 b918682..7b59d0a 100644
--- a/lib/DBIx/Class/Storage/DBI/Sybase/NoBindVars.pm
+++ b/lib/DBIx/Class/Storage/DBI/Sybase/NoBindVars.pm
@@ -11,15 +11,11 @@ use Scalar::Util ();
 sub _rebless {
   my $self = shift;
   $self->disable_sth_caching(1);
+  $self->insert_txn(0);
 }
 
-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];
-}
+# this works when NOT using placeholders
+sub _fetch_identity_sql { 'SELECT @@IDENTITY' }
 
 my $number = sub { Scalar::Util::looks_like_number($_[0]) };
 
@@ -44,7 +40,7 @@ sub should_quote_value {
 
   if (my $key = List::Util::first { $type =~ /$_/i } keys %noquote) {
     return 0 if $noquote{$key}->($value);
-  } elsif($self->is_datatype_numeric($type) && $number->($value)) {
+  } elsif ($self->is_datatype_numeric($type) && $number->($value)) {
     return 0;
   }
 
@@ -56,6 +52,17 @@ sub should_quote_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
@@ -65,18 +72,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 -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.
+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:
 
@@ -89,7 +86,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.