[Bast-commits] r7679 - in
DBIx-Class/0.08/branches/sybase_bulk_insert:
lib/DBIx/Class/Storage lib/DBIx/Class/Storage/DBI t
caelum at dev.catalyst.perl.org
caelum at dev.catalyst.perl.org
Fri Sep 18 09:10:17 GMT 2009
Author: caelum
Date: 2009-09-18 09:10:16 +0000 (Fri, 18 Sep 2009)
New Revision: 7679
Modified:
DBIx-Class/0.08/branches/sybase_bulk_insert/lib/DBIx/Class/Storage/DBI.pm
DBIx-Class/0.08/branches/sybase_bulk_insert/lib/DBIx/Class/Storage/DBI/Sybase.pm
DBIx-Class/0.08/branches/sybase_bulk_insert/t/746sybase.t
Log:
support for blobs in insert_bulk fallback
Modified: DBIx-Class/0.08/branches/sybase_bulk_insert/lib/DBIx/Class/Storage/DBI/Sybase.pm
===================================================================
--- DBIx-Class/0.08/branches/sybase_bulk_insert/lib/DBIx/Class/Storage/DBI/Sybase.pm 2009-09-18 07:21:31 UTC (rev 7678)
+++ DBIx-Class/0.08/branches/sybase_bulk_insert/lib/DBIx/Class/Storage/DBI/Sybase.pm 2009-09-18 09:10:16 UTC (rev 7679)
@@ -520,8 +520,13 @@
my $self = shift;
my ($source, $cols, $data) = @_;
+ my $identity_col = List::Util::first
+ { $source->column_info($_)->{is_auto_increment} }
+ $source->columns;
+
my $is_identity_insert = (List::Util::first
- { $source->column_info ($_)->{is_auto_increment} } @{$cols}
+ { $source->column_info ($_)->{is_auto_increment} }
+ @{$cols}
) ? 1 : 0;
my @source_columns = $source->columns;
@@ -541,16 +546,52 @@
}
if (not $use_bulk_api) {
- if ($is_identity_insert) {
- $self->_set_identity_insert ($source->name);
- }
+ 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)) {
+ ($self->_writer_storage, $self->_writer_storage->txn_scope_guard);
+ }
+ else {
+ ($self, undef);
+ }
+ };
+
+ $self->_set_identity_insert ($source->name) if $is_identity_insert;
$self->next::method(@_);
+ $self->_unset_identity_insert ($source->name) if $is_identity_insert;
- if ($is_identity_insert) {
- $self->_unset_identity_insert ($source->name);
+ if ($blob_cols) {
+ if ($is_identity_insert) {
+ $self->_insert_blobs_array ($source, $blob_cols, $cols, $data);
+ }
+ else {
+ my @cols_with_identities = (@$cols, $identity_col);
+
+ ## calculate identities
+ # XXX This assumes identities always increase by 1, which may or may not
+ # be true.
+ my ($last_identity) =
+ $self->_dbh->selectrow_array (
+ $self->_fetch_identity_sql($source, $identity_col)
+ );
+ my @identities = (($last_identity - @$data + 1) .. $last_identity);
+
+ my @data_with_identities = map [@$_, shift @identities], @$data;
+
+ $self->_insert_blobs_array (
+ $source, $blob_cols, \@cols_with_identities, \@data_with_identities
+ );
+ }
}
+ $guard->commit if $guard;
return;
}
@@ -575,9 +616,6 @@
push @new_data, $new_datum;
}
- my $identity_col = List::Util::first
- { $source->column_info($_)->{is_auto_increment} } @source_columns;
-
# bcp identity index is 1-based
my $identity_idx = exists $new_idx{$identity_col} ?
$new_idx{$identity_col} + 1 : 0;
@@ -727,6 +765,33 @@
return keys %blob_cols ? \%blob_cols : undef;
}
+# same for insert_bulk
+sub _remove_blob_cols_array {
+ my ($self, $source, $cols, $data) = @_;
+
+ my @blob_cols;
+
+ for my $i (0..$#$cols) {
+ my $col = $cols->[$i];
+
+ if ($self->_is_lob_type($source->column_info($col)->{data_type})) {
+ for my $j (0..$#$data) {
+ my $blob_val = delete $data->[$j][$i];
+ if (not defined $blob_val) {
+ $data->[$j][$i] = \'NULL';
+ }
+ else {
+ $data->[$j][$i] = \"''";
+ $blob_cols[$j][$i] = $blob_val
+ unless $blob_val eq '';
+ }
+ }
+ }
+ }
+
+ return @blob_cols ? \@blob_cols : undef;
+}
+
sub _update_blobs {
my ($self, $source, $blob_cols, $where) = @_;
@@ -829,6 +894,26 @@
}
}
+sub _insert_blobs_array {
+ my ($self, $source, $blob_cols, $cols, $data) = @_;
+
+ for my $i (0..$#$data) {
+ my $datum = $data->[$i];
+
+ my %row;
+ @row{ @$cols } = @$datum;
+
+ my %blob_vals;
+ for my $j (0..$#$cols) {
+ if (exists $blob_cols->[$i][$j]) {
+ $blob_vals{ $cols->[$j] } = $blob_cols->[$i][$j];
+ }
+ }
+
+ $self->_insert_blobs ($source, \%blob_vals, \%row);
+ }
+}
+
=head2 connect_call_datetime_setup
Used as:
Modified: DBIx-Class/0.08/branches/sybase_bulk_insert/lib/DBIx/Class/Storage/DBI.pm
===================================================================
--- DBIx-Class/0.08/branches/sybase_bulk_insert/lib/DBIx/Class/Storage/DBI.pm 2009-09-18 07:21:31 UTC (rev 7678)
+++ DBIx-Class/0.08/branches/sybase_bulk_insert/lib/DBIx/Class/Storage/DBI.pm 2009-09-18 09:10:16 UTC (rev 7679)
@@ -1337,18 +1337,52 @@
}
my %colvalues;
- my $table = $source->from;
@colvalues{@$cols} = (0..$#$cols);
+ # bind literal sql if it's the same in all slices
+ for my $i (0..$#$cols) {
+ my $first_val = $data->[0][$i];
+ next unless (Scalar::Util::reftype($first_val)||'') eq 'SCALAR';
+
+ $colvalues{ $cols->[$i] } = $first_val
+ if (grep {
+ (Scalar::Util::reftype($_)||'') eq 'SCALAR' &&
+ $$_ eq $$first_val
+ } map $data->[$_][$i], (1..$#$data)) == (@$data - 1);
+ }
+
my ($sql, $bind) = $self->_prep_for_execute (
'insert', undef, $source, [\%colvalues]
);
- my @bind = @$bind
- or croak 'Cannot insert_bulk without support for placeholders';
+ my @bind = @$bind;
+ my $empty_bind = 1 if (not @bind) &&
+ (grep { (Scalar::Util::reftype($_)||'') eq 'SCALAR' } values %colvalues)
+ == @$cols;
+
+ if ((not @bind) && (not $empty_bind)) {
+ croak 'Cannot insert_bulk without support for placeholders';
+ }
+
$self->_query_start( $sql, @bind );
my $sth = $self->sth($sql, 'insert', $sth_attr);
+ if ($empty_bind) {
+ # bind_param_array doesn't work if there are no binds
+ eval {
+ local $self->_get_dbh->{RaiseError} = 1;
+ local $self->_get_dbh->{PrintError} = 0;
+ foreach (0..$#$data) {
+ $sth->execute;
+ $sth->fetchall_arrayref;
+ }
+ };
+ my $exception = $@;
+ $sth->finish;
+ $self->throw_exception($exception) if $exception;
+ return;
+ }
+
# @bind = map { ref $_ ? ''.$_ : $_ } @bind; # stringify args
## This must be an arrayref, else nothing works!
@@ -1375,6 +1409,7 @@
$sth->bind_param_array( $placeholder_index, [@data], $attributes );
$placeholder_index++;
}
+
my $rv = eval { $sth->execute_array({ArrayTupleStatus => $tuple_status}) };
$sth->finish;
if (my $err = $@ || $sth->errstr) {
Modified: DBIx-Class/0.08/branches/sybase_bulk_insert/t/746sybase.t
===================================================================
--- DBIx-Class/0.08/branches/sybase_bulk_insert/t/746sybase.t 2009-09-18 07:21:31 UTC (rev 7678)
+++ DBIx-Class/0.08/branches/sybase_bulk_insert/t/746sybase.t 2009-09-18 09:10:16 UTC (rev 7679)
@@ -245,31 +245,36 @@
}
# make sure insert_bulk works a second time on the same connection
- lives_ok {
- $schema->resultset('Artist')->populate([
- {
- name => 'bulk artist 1',
- charfield => 'bar',
- },
- {
- name => 'bulk artist 2',
- charfield => 'bar',
- },
- {
- name => 'bulk artist 3',
- charfield => 'bar',
- },
- ]);
- } 'insert_bulk via populate called a second time';
+ SKIP: {
+ skip 'insert_bulk not supported', 3
+ unless $schema->storage->_can_insert_bulk;
- is $bulk_rs->count, 3,
- 'correct number inserted via insert_bulk';
+ lives_ok {
+ $schema->resultset('Artist')->populate([
+ {
+ name => 'bulk artist 1',
+ charfield => 'bar',
+ },
+ {
+ name => 'bulk artist 2',
+ charfield => 'bar',
+ },
+ {
+ name => 'bulk artist 3',
+ charfield => 'bar',
+ },
+ ]);
+ } 'insert_bulk via populate called a second time';
- is ((grep $_->charfield eq 'bar', $bulk_rs->all), 3,
- 'column set correctly via insert_bulk');
+ is $bulk_rs->count, 3,
+ 'correct number inserted via insert_bulk';
- $bulk_rs->delete;
+ is ((grep $_->charfield eq 'bar', $bulk_rs->all), 3,
+ 'column set correctly via insert_bulk');
+ $bulk_rs->delete;
+ }
+
# test invalid insert_bulk (missing required column)
#
# There should be a rollback, reconnect and the next valid insert_bulk should
@@ -280,9 +285,10 @@
charfield => 'foo',
}
]);
- } qr/no value or default|does not allow null/i,
+ } qr/no value or default|does not allow null|placeholders/i,
# The second pattern is the error from fallback to regular array insert on
# incompatible charset.
+# The third is for ::NoBindVars with no syb_has_blk.
'insert_bulk with missing required column throws error';
# now test insert_bulk with IDENTITY_INSERT
@@ -342,7 +348,7 @@
CREATE TABLE bindtype_test
(
id INT IDENTITY PRIMARY KEY,
- bytea INT NULL,
+ bytea IMAGE NULL,
blob IMAGE NULL,
clob TEXT NULL
)
More information about the Bast-commits
mailing list