X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FStorage%2FDBI%2FSybase.pm;h=886308d0fad35a0f5f90c4f38b07c2f4a204788b;hb=58e3556d625168736ee3548b60bd0833cb99e69e;hp=c20a075fff55df7d8dbd0495eb5e947e372ebe77;hpb=310a0a0a7ccff74b1668a5009edd1f60a972f262;p=dbsrgits%2FDBIx-Class.git diff --git a/lib/DBIx/Class/Storage/DBI/Sybase.pm b/lib/DBIx/Class/Storage/DBI/Sybase.pm index c20a075..886308d 100644 --- a/lib/DBIx/Class/Storage/DBI/Sybase.pm +++ b/lib/DBIx/Class/Storage/DBI/Sybase.pm @@ -5,13 +5,14 @@ use warnings; use base qw/ DBIx::Class::Storage::DBI::Sybase::Common + DBIx::Class::Storage::DBI::AutoCast /; use mro 'c3'; use Carp::Clan qw/^DBIx::Class/; use List::Util (); __PACKAGE__->mk_group_accessors('simple' => - qw/_identity _blob_log_on_update auto_cast insert_txn/ + qw/_identity _blob_log_on_update insert_txn/ ); =head1 NAME @@ -97,8 +98,9 @@ EOF $self->set_textsize; # based on LongReadLen in connect_info - } elsif (not $self->dbh->{syb_dynamic_supported}) { -# not necessarily FreeTDS, but no placeholders nevertheless + } + elsif (not $self->dbh->{syb_dynamic_supported}) { + # not necessarily FreeTDS, but no placeholders nevertheless $self->ensure_class_loaded($no_bind_vars); bless $self, $no_bind_vars; $self->_rebless; @@ -106,7 +108,7 @@ EOF # this is highly unlikely, but we check just in case $self->auto_cast(1); } - + $self->_set_max_connect(256); } } @@ -161,33 +163,6 @@ sub connect_call_blob_setup { if exists $args{log_on_update}; } -=head2 connect_call_set_auto_cast - -In some configurations (usually with L) statements with values bound -to columns or conditions that are not strings will throw implicit type -conversion errors. For L this is automatically detected, and this -option is set. - -It converts placeholders to: - - CAST(? as $type) - -the type is taken from the L setting from -your Result class, and mapped to a Sybase type using a mapping based on -L if necessary. - -This setting can also be set outside of -L at any time using: - - $schema->storage->auto_cast(1); - -=cut - -sub connect_call_set_auto_cast { - my $self = shift; - $self->auto_cast(1); -} - =head2 connect_call_unsafe_insert With placeholders enabled, inserts are done in a transaction so that there are @@ -220,55 +195,35 @@ sub _is_lob_type { $type && $type =~ /(?:text|image|lob|bytea|binary|memo)/i; } -# The select-piggybacking-on-insert trick stolen from odbc/mssql sub _prep_for_execute { my $self = shift; my ($op, $extra_bind, $ident, $args) = @_; my ($sql, $bind) = $self->next::method (@_); -# Some combinations of FreeTDS and Sybase throw implicit conversion errors for -# all placeeholders, so we convert them into CASTs here. -# Based on code in ::DBI::NoBindVars . -# -# If we're using ::NoBindVars, there are no binds by this point so this code -# gets skippeed. - if ($self->auto_cast && @$bind) { - my $new_sql; - my @sql_part = split /\?/, $sql; - my $col_info = $self->_resolve_column_info($ident,[ map $_->[0], @$bind ]); - - foreach my $bound (@$bind) { - my $col = $bound->[0]; - my $syb_type = $self->_syb_base_type($col_info->{$col}{data_type}); - - foreach my $data (@{$bound}[1..$#$bound]) { - $new_sql .= shift(@sql_part) . - ($syb_type ? "CAST(? AS $syb_type)" : '?'); - } - } - $new_sql .= join '', @sql_part; - $sql = $new_sql; - } - if ($op eq 'insert') { my $table = $ident->from; my $bind_info = $self->_resolve_column_info( $ident, [map $_->[0], @{$bind}] ); - my $identity_col = -List::Util::first { $bind_info->{$_}{is_auto_increment} } (keys %$bind_info); + my $identity_col = List::Util::first + { $bind_info->{$_}{is_auto_increment} } + (keys %$bind_info) + ; if ($identity_col) { - $sql = -"SET IDENTITY_INSERT $table ON\n" . -"$sql\n" . -"SET IDENTITY_INSERT $table OFF" - } else { - $identity_col = List::Util::first { - $ident->column_info($_)->{is_auto_increment} - } $ident->columns; + $sql = join ("\n", + "SET IDENTITY_INSERT $table ON", + $sql, + "SET IDENTITY_INSERT $table OFF", + ); + } + else { + $identity_col = List::Util::first + { $ident->column_info($_)->{is_auto_increment} } + $ident->columns + ; } if ($identity_col) { @@ -281,9 +236,10 @@ List::Util::first { $bind_info->{$_}{is_auto_increment} } (keys %$bind_info); return ($sql, $bind); } -# Stolen from SQLT, with some modifications. This will likely change when the -# SQLT Sybase stuff is redone/fixed-up. -my %TYPE_MAPPING = ( +# Stolen from SQLT, with some modifications. This is a makeshift +# solution before a sane type-mapping library is available, thus +# the 'our' for easy overrides. +our %TYPE_MAPPING = ( number => 'numeric', money => 'money', varchar => 'varchar', @@ -301,7 +257,7 @@ my %TYPE_MAPPING = ( long => 'varchar', ); -sub _syb_base_type { +sub _native_data_type { my ($self, $type) = @_; $type = lc $type; @@ -334,8 +290,8 @@ sub last_insert_id { shift->_identity } # override to handle TEXT/IMAGE and to do a transaction if necessary sub insert { - my ($self, $source, $to_insert) = splice @_, 0, 3; - my $dbh = $self->_dbh; + my $self = shift; + my ($source, $to_insert) = @_; my $blob_cols = $self->_remove_blob_cols($source, $to_insert); @@ -350,18 +306,18 @@ sub insert { $need_last_insert_id = 1 if $identity_col && (not exists $to_insert->{$identity_col}); -# 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. + # 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})) { - my $args = \@_; - my $method = $self->next::can; - $self->txn_do( - sub { $self->$method($source, $to_insert, @$args) } - ); - } else { - $self->next::method($source, $to_insert, @_); + my $guard = $self->txn_scope_guard; + my $upd_cols = $self->next::method (@_); + $guard->commit; + $upd_cols; + } + else { + $self->next::method(@_); } }; @@ -371,17 +327,22 @@ sub insert { } sub update { - my ($self, $source) = splice @_, 0, 2; - my ($fields, $where) = @_; - my $wantarray = wantarray; + my $self = shift; + my ($source, $fields, $where) = @_; + + my $wantarray = wantarray; my $blob_cols = $self->_remove_blob_cols($source, $fields); my @res; if ($wantarray) { - @res = $self->next::method($source, @_); - } else { - $res[0] = $self->next::method($source, @_); + @res = $self->next::method(@_); + } + elsif (defined $wantarray) { + $res[0] = $self->next::method(@_); + } + else { + $self->next::method(@_); } $self->_update_blobs($source, $blob_cols, $where) if %$blob_cols; @@ -493,9 +454,10 @@ sub _insert_blobs { $sth->finish if $sth; if ($exception) { if ($self->using_freetds) { - croak -"TEXT/IMAGE operation failed, probably because you're using FreeTDS: " . -$exception; + croak ( + 'TEXT/IMAGE operation failed, probably because you are using FreeTDS: ' + . $exception + ); } else { croak $exception; } @@ -530,7 +492,7 @@ C columns only have minute precision. my $dbh = $self->_dbh; if ($dbh->can('syb_date_fmt')) { -# amazingly, this works with FreeTDS + # amazingly, this works with FreeTDS $dbh->syb_date_fmt('ISO_strict'); } elsif (not $old_dbd_warned) { carp "Your DBD::Sybase is too old to support ". @@ -602,7 +564,7 @@ allow you to dump a schema from most (if not all) versions of Sybase. It is available via subversion from: - http://dev.catalyst.perl.org/repos/bast/branches/DBIx-Class-Schema-Loader/mssql_tweaks + http://dev.catalyst.perl.org/repos/bast/branches/DBIx-Class-Schema-Loader/current/ =head1 FreeTDS @@ -625,11 +587,14 @@ Some versions of the libraries involved will not support placeholders, in which case the storage will be reblessed to L. -In some configurations, placeholders will work but will throw implicit +In some configurations, placeholders will work but will throw implicit type conversion errors for anything that's not expecting a string. In such a case, -the C option is automatically set, which you may enable yourself with -L (see the description of that method for more -details.) +the C option from L is +automatically set, which you may enable on connection with +L. The type info +for the Cs is taken from the L +definitions in your Result classes, and are mapped to a Sybase type (if it isn't +already) using a mapping based on L. In other configurations, placeholers will work just as they do with the Sybase Open Client libraries. @@ -677,7 +642,7 @@ C command on connection. See L for a L setting you need to work with C columns. -=head1 AUTHORS +=head1 AUTHOR See L.