X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FStorage%2FDBI%2FSybase.pm;h=9851303d6a384d024080e48651600a51e7700fad;hb=689819e14e9e6245000c64ece46ddd1bc8293bf5;hp=53b2f50592bd81c61be2e146ef8bf4dffa25f87b;hpb=759ca0fe2f58751ad7b74247a2e1d871af9f6fd0;p=dbsrgits%2FDBIx-Class.git diff --git a/lib/DBIx/Class/Storage/DBI/Sybase.pm b/lib/DBIx/Class/Storage/DBI/Sybase.pm index 53b2f50..9851303 100644 --- a/lib/DBIx/Class/Storage/DBI/Sybase.pm +++ b/lib/DBIx/Class/Storage/DBI/Sybase.pm @@ -10,11 +10,21 @@ use base qw/ use mro 'c3'; use Carp::Clan qw/^DBIx::Class/; use List::Util (); +use Sub::Name (); __PACKAGE__->mk_group_accessors('simple' => - qw/_identity _blob_log_on_update _insert_dbh _identity_method/ + qw/_identity _blob_log_on_update _writer_storage _is_writer_storage + _identity_method/ ); +my @also_proxy_to_writer_storage = qw/ + connect_call_set_auto_cast auto_cast connect_call_blob_setup + connect_call_datetime_setup + + disconnect _connect_info _sql_maker _sql_maker_opts disable_sth_caching + auto_savepoint unsafe cursor_class debug debugobj schema +/; + =head1 NAME DBIx::Class::Storage::DBI::Sybase - Sybase support for DBIx::Class @@ -108,6 +118,31 @@ sub _init { # based on LongReadLen in connect_info $self->set_textsize if $self->using_freetds; + +# create storage for insert/(update blob) transactions, +# unless this is that storage + return if $self->_is_writer_storage; + + my $writer_storage = (ref $self)->new; + + $writer_storage->_is_writer_storage(1); + $writer_storage->connect_info($self->connect_info); + $writer_storage->auto_cast($self->auto_cast); + + $self->_writer_storage($writer_storage); +} + +for my $method (@also_proxy_to_writer_storage) { + no strict 'refs'; + no warnings 'redefine'; + + my $replaced = __PACKAGE__->can($method); + + *{$method} = Sub::Name::subname __PACKAGE__."::$method" => sub { + my $self = shift; + $self->_writer_storage->$replaced(@_) if $self->_writer_storage; + return $self->$replaced(@_); + }; } # Make sure we have CHAINED mode turned on if AutoCommit is off in non-FreeTDS @@ -165,6 +200,12 @@ sub _is_lob_type { $type && $type =~ /(?:text|image|lob|bytea|binary|memo)/i; } +sub _is_lob_column { + my ($self, $source, $column) = @_; + + return $self->_is_lob_type($source->column_info($column)->{data_type}); +} + sub _prep_for_execute { my $self = shift; my ($op, $extra_bind, $ident, $args) = @_; @@ -273,10 +314,9 @@ sub insert { # do we need the horrific SELECT MAX(COL) hack? my $dumb_last_insert_id = - ( $identity_col - && (not exists $to_insert->{$identity_col}) - && ($self->_identity_method||'') ne '@@IDENTITY' - ) ? 1 : 0; + $identity_col + && (not exists $to_insert->{$identity_col}) + && ($self->_identity_method||'') ne '@@IDENTITY'; my $next = $self->next::can; @@ -286,42 +326,27 @@ sub insert { || (!$blob_cols && !$dumb_last_insert_id) ) { return $self->_insert ( - $source, $to_insert, $blob_cols, $identity_col, $next + $next, $source, $to_insert, $blob_cols, $identity_col ); } - # this is tricky: a transaction needs to take place if we need - # either a last_insert_id or we will be doing blob insert. - # This will happen on a *seperate* connection, thus the local() - # acrobatics - - local $self->{_dbh}; - - # localize so it appears right if we blow out with an exception - local $self->{transaction_depth} = 0; + # otherwise use the _writer_storage to do the insert+transaction on another + # connection + my $guard = $self->_writer_storage->txn_scope_guard; - $self->_insert_dbh($self->_connect(@{ $self->_dbi_connect_info })) - unless $self->_insert_dbh; - - $self->{_dbh} = $self->_insert_dbh; - my $guard = $self->txn_scope_guard; - - # _dbh_begin_work in the guard may reconnect, - # so we update the accessor just in case - $self->_insert_dbh($self->_dbh); - - my $updated_cols = $self->_insert ( - $source, $to_insert, $blob_cols, $identity_col, $next + my $updated_cols = $self->_writer_storage->_insert ( + $next, $source, $to_insert, $blob_cols, $identity_col ); + $self->_identity($self->_writer_storage->_identity); + $guard->commit; return $updated_cols; - } sub _insert { - my ($self, $source, $to_insert, $blob_cols, $identity_col, $next) = @_; + my ($self, $next, $source, $to_insert, $blob_cols, $identity_col) = @_; my $updated_cols = $self->$next ($source, $to_insert); @@ -338,33 +363,145 @@ sub _insert { sub update { my $self = shift; - my ($source, $fields, $where) = @_; + my ($source, $fields, $where, @rest) = @_; my $wantarray = wantarray; 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 $table = $source->name; - my @res; - if ($wantarray) { - @res = $self->next::method(@_); - } - elsif (defined $wantarray) { - $res[0] = $self->next::method(@_); + my $identity_col = List::Util::first + { $source->column_info($_)->{is_auto_increment} } + $source->columns; + + my $is_identity_update = $identity_col && defined $fields->{$identity_col}; + + if (not $blob_cols) { + $self->_set_identity_insert($table, 'update') if $is_identity_update; + return $self->next::method(@_); + $self->_unset_identity_insert($table, 'update') if $is_identity_update; } - else { - $self->next::method(@_); + +# 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'; + } } - $self->_update_blobs($source, $blob_cols, $where) if $blob_cols; +# update+blob update(s) done atomically on separate connection + $self = $self->_writer_storage; + + my $guard = $self->txn_scope_guard; - $guard->commit if $guard; +# First update the blob columns to be updated to '' (taken from $fields, where +# it is originally put by _remove_blob_cols .) + my %blobs_to_empty = map { ($_ => delete $fields->{$_}) } keys %$blob_cols; + + $self->next::method($source, \%blobs_to_empty, $where, @rest); + +# Now update the blobs before the other columns in case the update of other +# columns makes the search condition invalid. + $self->_update_blobs($source, $blob_cols, $where); + + my @res; + if (%$fields) { + $self->_set_identity_insert($table, 'update') if $is_identity_update; + + if ($wantarray) { + @res = $self->next::method(@_); + } + elsif (defined $wantarray) { + $res[0] = $self->next::method(@_); + } + else { + $self->next::method(@_); + } + + $self->_unset_identity_insert($table, 'update') if $is_identity_update; + } + + $guard->commit; return $wantarray ? @res : $res[0]; } +### the insert_bulk stuff stolen from DBI/MSSQL.pm + +sub _set_identity_insert { + my ($self, $table, $op) = @_; + + my $sql = sprintf ( + 'SET IDENTITY_%s %s ON', + (uc($op) || 'INSERT'), + $self->sql_maker->_quote ($table), + ); + + $self->_query_start($sql); + + my $dbh = $self->_get_dbh; + eval { $dbh->do ($sql) }; + my $exception = $@; + + $self->_query_end($sql); + + if ($exception) { + $self->throw_exception (sprintf "Error executing '%s': %s", + $sql, + $dbh->errstr, + ); + } +} + +sub _unset_identity_insert { + my ($self, $table, $op) = @_; + + my $sql = sprintf ( + 'SET IDENTITY_%s %s OFF', + (uc($op) || 'INSERT'), + $self->sql_maker->_quote ($table), + ); + + $self->_query_start($sql); + + my $dbh = $self->_get_dbh; + $dbh->do ($sql); + + $self->_query_end($sql); +} + +# for tests +sub _can_insert_bulk { 1 } + +# XXX this should use the DBD::Sybase bulk API, where possible +sub insert_bulk { + my $self = shift; + my ($source, $cols, $data) = @_; + + my $is_identity_insert = (List::Util::first + { $source->column_info ($_)->{is_auto_increment} } + (@{$cols}) + ) + ? 1 + : 0; + + if ($is_identity_insert) { + $self->_set_identity_insert ($source->name); + } + + $self->next::method(@_); + + if ($is_identity_insert) { + $self->_unset_identity_insert ($source->name); + } +} + +### end of stolen insert_bulk section + +# Make sure blobs are not bound as placeholders, and return any non-empty ones +# as a hash. sub _remove_blob_cols { my ($self, $source, $fields) = @_; @@ -372,8 +509,14 @@ sub _remove_blob_cols { for my $col (keys %$fields) { if ($self->_is_lob_type($source->column_info($col)->{data_type})) { - $blob_cols{$col} = delete $fields->{$col}; - $fields->{$col} = \"''"; + my $blob_val = delete $fields->{$col}; + if (not defined $blob_val) { + $fields->{$col} = \'NULL'; + } + else { + $fields->{$col} = \"''"; + $blob_cols{$col} = $blob_val unless $blob_val eq ''; + } } } @@ -385,7 +528,7 @@ sub _update_blobs { my (@primary_cols) = $source->primary_columns; - croak "Cannot update TEXT/IMAGE column(s) without a primary key" + $self->throw_exception('Cannot update TEXT/IMAGE column(s) without a primary key') unless @primary_cols; # check if we're updating a single row by PK @@ -400,14 +543,10 @@ sub _update_blobs { @row_to_update{@primary_cols} = @{$where}{@primary_cols}; @rows = \%row_to_update; } else { - my $rs = $source->resultset->search( - $where, - { - result_class => 'DBIx::Class::ResultClass::HashRefInflator', - columns => \@primary_cols - } - ); - @rows = $rs->all; # statement must finish + my $cursor = $self->select ($source, \@primary_cols, $where, {}); + @rows = map { + my %row; @row{@primary_cols} = @$_; \%row + } $cursor->all; } for my $row (@rows) { @@ -419,28 +558,34 @@ sub _insert_blobs { my ($self, $source, $blob_cols, $row) = @_; my $dbh = $self->_get_dbh; - my $table = $source->from; + my $table = $source->name; my %row = %$row; my (@primary_cols) = $source->primary_columns; - croak "Cannot update TEXT/IMAGE column(s) without a primary key" + $self->throw_exception('Cannot update TEXT/IMAGE column(s) without a primary key') unless @primary_cols; - if ((grep { defined $row{$_} } @primary_cols) != @primary_cols) { - croak "Cannot update TEXT/IMAGE column(s) without primary key values"; - } + $self->throw_exception('Cannot update TEXT/IMAGE column(s) without primary key values') + if ((grep { defined $row{$_} } @primary_cols) != @primary_cols); for my $col (keys %$blob_cols) { my $blob = $blob_cols->{$col}; my %where = map { ($_, $row{$_}) } @primary_cols; - my $cursor = $source->resultset->search(\%where, { - select => [$col] - })->cursor; + + my $cursor = $self->select ($source, [$col], \%where, {}); $cursor->next; my $sth = $cursor->sth; + if (not $sth) { + + $self->throw_exception( + "Could not find row in table '$table' for blob update:\n" + . $self->_pretty_print (\%where) + ); + } + eval { do { $sth->func('CS_GET', 1, 'ct_data_info') or die $sth->errstr; @@ -464,12 +609,12 @@ sub _insert_blobs { $sth->finish if $sth; if ($exception) { if ($self->using_freetds) { - croak ( + $self->throw_exception ( 'TEXT/IMAGE operation failed, probably because you are using FreeTDS: ' . $exception ); } else { - croak $exception; + $self->throw_exception($exception); } } } @@ -618,6 +763,9 @@ no concurrency issues with getting the inserted identity value using C as it's a session variable. @@ -643,7 +791,7 @@ For example, this will not work: }); Transactions done for inserts in C mode when placeholders are in use -are not affected, as they use an extra database handle to do the insert. +are not affected, as they are done on an extra database handle. Some workarounds: