remove some duplicate code

[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 7c3b995..5747cb9 100644 (file)
--- a/lib/DBIx/Class/Storage/DBI/Sybase.pm
+++ b/lib/DBIx/Class/Storage/DBI/Sybase.pm
@@ -428,13 +428,8 @@ sub update {
       if $is_identity_update;
   }
 
-# check that we're not updating a blob column that's also in $where
-  for my $blob (grep $self->_is_lob_column($source, $_), $source->columns) {
-    if (exists $where->{$blob} && exists $fields->{$blob}) {
-      croak
-'Update of TEXT/IMAGE column that is also in search condition impossible';
-    }
-  }
+# If there are any blobs in $where, Sybase will return a descriptive error
+# message.
 
 # update+blob update(s) done atomically on separate connection
   $self = $self->_writer_storage;
@@ -475,6 +470,7 @@ sub update {
   return $wantarray ? @res : $res[0];
 }
 
+# for IDENTITY_INSERT / IDENTITY_UPDATE
 sub _set_session_identity {
   my ($self, $op, $table, $off_on) = @_;
 
@@ -505,9 +501,6 @@ sub _set_session_identity {
   }
 }
 
-# for tests
-sub _can_insert_bulk { 1 }
-
 sub insert_bulk {
   my $self = shift;
   my ($source, $cols, $data) = @_;
@@ -517,7 +510,7 @@ sub insert_bulk {
     $source->columns;
 
   my $is_identity_insert = (List::Util::first
-    { $source->column_info ($_)->{is_auto_increment} }
+    { $_ eq $identity_col }
     @{$cols}
   ) ? 1 : 0;
 
@@ -532,7 +525,7 @@ sub insert_bulk {
       (not $self->_bulk_disabled_due_to_coderef_connect_info_warned)) {
     carp <<'EOF';
 Bulk API support disabled due to use of a CODEREF connect_info. Reverting to
-array inserts.
+regular array inserts.
 EOF
     $self->_bulk_disabled_due_to_coderef_connect_info_warned(1);
   }
@@ -540,14 +533,8 @@ EOF
   if (not $use_bulk_api) {
     my $blob_cols = $self->_remove_blob_cols_array($source, $cols, $data);
 
-    my $dumb_last_insert_id =
-         $identity_col
-      && (not $is_identity_insert)
-      && ($self->_identity_method||'') ne '@@IDENTITY';
-
     ($self, my ($guard)) = do {
-      if ($self->{transaction_depth} == 0 &&
-          ($blob_cols || $dumb_last_insert_id)) {
+      if ($self->{transaction_depth} == 0 && $blob_cols) {
         ($self->_writer_storage, $self->_writer_storage->txn_scope_guard);
       }
       else {
@@ -660,42 +647,14 @@ EOF
       }
     );
 
-    my $bind_attributes = $self->source_bind_attributes($source);
-
-    foreach my $slice_idx (0..$#source_columns) {
-      my $col = $source_columns[$slice_idx];
-
-      my $attributes = $bind_attributes->{$col}
-        if $bind_attributes && defined $bind_attributes->{$col};
-
-      my @slice = map $_->[$slice_idx], @new_data;
-
-      $sth->bind_param_array(($slice_idx + 1), \@slice, $attributes);
-    }
-
-    $bulk->_query_start($sql);
-
-# this is stolen from DBI::insert_bulk
-    my $tuple_status = [];
-    my $rv = eval { $sth->execute_array({ArrayTupleStatus => $tuple_status}) };
-
-    if (my $err = $@ || $sth->errstr) {
-      my $i = 0;
-      ++$i while $i <= $#$tuple_status && !ref $tuple_status->[$i];
-
-      $self->throw_exception("Unexpected populate error: $err")
-        if ($i > $#$tuple_status);
-
-      $self->throw_exception(sprintf "%s for populate slice:\n%s",
-        ($tuple_status->[$i][1] || $err),
-        $self->_pretty_print ({
-          map { $source_columns[$_] => $new_data[$i][$_] } (0 .. $#$cols)
-        }),
-      );
-    }
+    my @bind = do {
+      my $idx = 0;
+      map [ $_, $idx++ ], @source_columns;
+    };
 
-    $guard->commit;
-    $sth->finish;
+    $self->_execute_array(
+      $source, $sth, \@bind, \@source_columns, \@new_data, $guard
+    );
 
     $bulk->_query_end($sql);
   };
@@ -733,7 +692,7 @@ sub _remove_blob_cols {
   my %blob_cols;
 
   for my $col (keys %$fields) {
-    if ($self->_is_lob_type($source->column_info($col)->{data_type})) {
+    if ($self->_is_lob_column($source, $col)) {
       my $blob_val = delete $fields->{$col};
       if (not defined $blob_val) {
         $fields->{$col} = \'NULL';
@@ -757,7 +716,7 @@ sub _remove_blob_cols_array {
   for my $i (0..$#$cols) {
     my $col = $cols->[$i];
 
-    if ($self->_is_lob_type($source->column_info($col)->{data_type})) {
+    if ($self->_is_lob_column($source, $col)) {
       for my $j (0..$#$data) {
         my $blob_val = delete $data->[$j][$i];
         if (not defined $blob_val) {
@@ -1053,10 +1012,10 @@ session variable.
 =head1 TRANSACTIONS
 
 Due to limitations of the TDS protocol, L<DBD::Sybase>, or both; you cannot
-begin a transaction while there are active cursors. An active cursor is, for
-example, a L<ResultSet|DBIx::Class::ResultSet> that has been executed using
-C<next> or C<first> but has not been exhausted or
-L<reset|DBIx::Class::ResultSet/reset>.
+begin a transaction while there are active cursors; nor can you use multiple
+active cursors within a transaction. An active cursor is, for example, a
+L<ResultSet|DBIx::Class::ResultSet> that has been executed using C<next> or
+C<first> but has not been exhausted or L<reset|DBIx::Class::ResultSet/reset>.
 
 For example, this will not work:
 
@@ -1070,6 +1029,11 @@ For example, this will not work:
     }
   });
 
+This won't either:
+
+  my $first_row = $large_rs->first;
+  $schema->txn_do(sub { ... });
+
 Transactions done for inserts in C<AutoCommit> mode when placeholders are in use
 are not affected, as they are done on an extra database handle.