pending review by mpeppler

[dbsrgits/DBIx-Class.git] / lib / DBIx / Class / Storage / DBI / Sybase.pm

diff --git a/lib/DBIx/Class/Storage/DBI/Sybase.pm b/lib/DBIx/Class/Storage/DBI/Sybase.pm
index 43b6e6c..6c07369 100644 (file)
--- a/lib/DBIx/Class/Storage/DBI/Sybase.pm
+++ b/lib/DBIx/Class/Storage/DBI/Sybase.pm
@@ -12,7 +12,7 @@ use Carp::Clan qw/^DBIx::Class/;
 use List::Util ();
 
 __PACKAGE__->mk_group_accessors('simple' =>
-    qw/_identity _blob_log_on_update insert_txn/
+    qw/_identity _blob_log_on_update unsafe_insert _insert_dbh/
 );
 
 =head1 NAME
@@ -65,10 +65,6 @@ sub _rebless {
     } else { # real Sybase
       my $no_bind_vars = 'DBIx::Class::Storage::DBI::Sybase::NoBindVars';
 
-# This is reset to 0 in ::NoBindVars, only necessary because we use max(col) to
-# get the identity.
-      $self->insert_txn(1);
-
       if ($self->using_freetds) {
         carp <<'EOF' unless $ENV{DBIC_SYBASE_FREETDS_NOWARN};
 
@@ -133,6 +129,8 @@ sub _populate_dbh {
       $self->_dbh->do('SET CHAINED ON');
     }
   }
+
+  $self->_insert_dbh($self->_connect(@{ $self->_dbi_connect_info }));
 }
 
 =head2 connect_call_blob_setup
@@ -181,13 +179,13 @@ L<DBIx::Class::Storage::DBI/connect_info>,
 
 To manipulate this setting at runtime, use:
 
-  $schema->storage->insert_txn(0); # 1 to re-enable
+  $schema->storage->unsafe_insert(0|1);
 
 =cut
 
 sub connect_call_unsafe_insert {
   my $self = shift;
-  $self->insert_txn(0);
+  $self->unsafe_insert(1);
 }
 
 sub _is_lob_type {
@@ -262,7 +260,7 @@ sub _native_data_type {
   my ($self, $type) = @_;
 
   $type = lc $type;
-  $type =~ s/ identity//;
+  $type =~ s/\s* identity//x;
 
   return uc($TYPE_MAPPING{$type} || $type);
 }
@@ -289,13 +287,16 @@ sub _execute {
 
 sub last_insert_id { shift->_identity }
 
-# override to handle TEXT/IMAGE and to do a transaction if necessary
+# handles TEXT/IMAGE and transaction for last_insert_id
 sub insert {
   my $self = shift;
   my ($source, $to_insert) = @_;
 
   my $blob_cols = $self->_remove_blob_cols($source, $to_insert);
 
+# insert+blob insert done atomically
+  my $guard = $self->txn_scope_guard if $blob_cols;
+
   my $need_last_insert_id = 0;
 
   my ($identity_col) =
@@ -310,8 +311,10 @@ sub insert {
   # We have to do the insert in a transaction to avoid race conditions with the
   # SELECT MAX(COL) identity method used when placeholders are enabled.
   my $updated_cols = do {
-    if ($need_last_insert_id && $self->insert_txn &&
-        (not $self->{transaction_depth})) {
+    if (
+      $need_last_insert_id && !$self->unsafe_insert && !$self->{transaction_depth}
+    ) {
+      local $self->{_dbh} = $self->_insert_dbh;
       my $guard = $self->txn_scope_guard;
       my $upd_cols = $self->next::method (@_);
       $guard->commit;
@@ -322,7 +325,9 @@ sub insert {
     }
   };
 
-  $self->_insert_blobs($source, $blob_cols, $to_insert) if %$blob_cols;
+  $self->_insert_blobs($source, $blob_cols, $to_insert) if $blob_cols;
+
+  $guard->commit if $guard;
 
   return $updated_cols;
 }
@@ -335,6 +340,9 @@ sub update {
 
   my $blob_cols = $self->_remove_blob_cols($source, $fields);
 
+# update+blob update(s) done atomically
+  my $guard = $self->txn_scope_guard if $blob_cols;
+
   my @res;
   if ($wantarray) {
     @res    = $self->next::method(@_);
@@ -346,7 +354,9 @@ sub update {
     $self->next::method(@_);
   }
 
-  $self->_update_blobs($source, $blob_cols, $where) if %$blob_cols;
+  $self->_update_blobs($source, $blob_cols, $where) if $blob_cols;
+
+  $guard->commit if $guard;
 
   return $wantarray ? @res : $res[0];
 }
@@ -363,7 +373,7 @@ sub _remove_blob_cols {
     }
   }
 
-  return \%blob_cols;
+  return keys %blob_cols ? \%blob_cols : undef;
 }
 
 sub _update_blobs {
@@ -621,7 +631,7 @@ Some workarounds:
 
 =over 4
 
-=item * set C<< $schema->storage->insert_txn(0) >> temporarily (see
+=item * set C<< $schema->storage->unsafe_insert(1) >> temporarily (see
 L</connect_call_unsafe_insert>)
 
 =item * use L<DBIx::Class::Storage::DBI::Replicated>