X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FStorage%2FDBI.pm;h=fdff258a0e9f5223d26626eaeefec7b294494226;hb=edbb5df16458258554431bddb3b4df98a526999d;hp=8c7f647fc38edbcf2e040cf571b0a21fe0b26f96;hpb=f49102d2abafb07215f9760bcfdf02b3502bc632;p=dbsrgits%2FDBIx-Class.git diff --git a/lib/DBIx/Class/Storage/DBI.pm b/lib/DBIx/Class/Storage/DBI.pm index 8c7f647..fdff258 100644 --- a/lib/DBIx/Class/Storage/DBI.pm +++ b/lib/DBIx/Class/Storage/DBI.pm @@ -14,6 +14,11 @@ use DBIx::Class::Storage::Statistics; use Scalar::Util(); use List::Util(); +# what version of sqlt do we require if deploy() without a ddl_dir is invoked +# when changing also adjust the corresponding author_require in Makefile.PL +my $minimum_sqlt_version = '0.11002'; + + __PACKAGE__->mk_group_accessors('simple' => qw/_connect_info _dbi_connect_info _dbh _sql_maker _sql_maker_opts _conn_pid _conn_tid transaction_depth _dbh_autocommit _driver_determined savepoints/ @@ -873,13 +878,14 @@ sub _determine_driver { my ($self) = @_; if ((not $self->_driver_determined) && (not $self->{_in_determine_driver})) { - my $started_unconnected = 0; + my $started_connected = 0; local $self->{_in_determine_driver} = 1; if (ref($self) eq __PACKAGE__) { my $driver; if ($self->_dbh) { # we are connected $driver = $self->_dbh->{Driver}{Name}; + $started_connected = 1; } else { # if connect_info is a CODEREF, we have no choice but to connect if (ref $self->_dbi_connect_info->[0] && @@ -891,7 +897,6 @@ sub _determine_driver { # try to use dsn to not require being connected, the driver may still # force a connection in _rebless to determine version ($driver) = $self->_dbi_connect_info->[0] =~ /dbi:([^:]+):/i; - $started_unconnected = 1; } } @@ -908,7 +913,7 @@ sub _determine_driver { $self->_init; # run driver-specific initializations $self->_run_connection_actions - if $started_unconnected && defined $self->_dbh; + if !$started_connected && defined $self->_dbh; } } @@ -1002,6 +1007,8 @@ sub _connect { $weak_self->throw_exception("DBI Exception: $_[0]"); } else { + # the handler may be invoked by something totally out of + # the scope of DBIC croak ("DBI Exception: $_[0]"); } }; @@ -1328,7 +1335,7 @@ sub insert { ## scalar refs, or at least, all the same type as the first set, the statement is ## only prepped once. sub insert_bulk { - my ($self, $source, $cols, $data, $sth_attr) = @_; + my ($self, $source, $cols, $data) = @_; # redispatch to insert_bulk method of storage we reblessed into, if necessary if (not $self->_driver_determined) { @@ -1339,15 +1346,10 @@ sub insert_bulk { my %colvalues; my $table = $source->from; @colvalues{@$cols} = (0..$#$cols); - - my ($sql, $bind) = $self->_prep_for_execute ( - 'insert', undef, $source, [\%colvalues] - ); - my @bind = @$bind - or croak 'Cannot insert_bulk without support for placeholders'; + my ($sql, @bind) = $self->sql_maker->insert($table, \%colvalues); $self->_query_start( $sql, @bind ); - my $sth = $self->sth($sql, 'insert', $sth_attr); + my $sth = $self->sth($sql); # @bind = map { ref $_ ? ''.$_ : $_ } @bind; # stringify args @@ -1376,12 +1378,11 @@ sub insert_bulk { $placeholder_index++; } my $rv = eval { $sth->execute_array({ArrayTupleStatus => $tuple_status}) }; - $sth->finish; - if (my $err = $@ || $sth->errstr) { + if (my $err = $@) { my $i = 0; ++$i while $i <= $#$tuple_status && !ref $tuple_status->[$i]; - $self->throw_exception("Unexpected populate error: $err") + $self->throw_exception($sth->errstr || "Unexpected populate error: $err") if ($i > $#$tuple_status); require Data::Dumper; @@ -1392,12 +1393,13 @@ sub insert_bulk { local $Data::Dumper::Sortkeys = 1; $self->throw_exception(sprintf "%s for populate slice:\n%s", - ($tuple_status->[$i][1] || $err), + $tuple_status->[$i][1], Data::Dumper::Dumper( { map { $cols->[$_] => $data->[$i][$_] } (0 .. $#$cols) } ), ); } + $self->throw_exception($sth->errstr) if !$rv; $self->_query_end( $sql, @bind ); return (wantarray ? ($rv, $sth, @bind) : $rv); @@ -1991,18 +1993,6 @@ sub _subq_count_select { return @pcols ? \@pcols : [ 1 ]; } -# -# Returns an ordered list of column names before they are used -# in a SELECT statement. By default simply returns the list -# passed in. -# -# This may be overridden in a specific storage when there are -# requirements such as moving BLOB columns to the end of the -# SELECT list. -sub _order_select_columns { - #my ($self, $source, $columns) = @_; - return @{$_[2]}; -} sub source_bind_attributes { my ($self, $source) = @_; @@ -2062,15 +2052,12 @@ Returns a L sth (statement handle) for the supplied SQL. =cut sub _dbh_sth { - my ($self, $dbh, $sql, $op, $sth_attr) = @_; -# $op is ignored right now - - $sth_attr ||= {}; + my ($self, $dbh, $sql) = @_; # 3 is the if_active parameter which avoids active sth re-use my $sth = $self->disable_sth_caching - ? $dbh->prepare($sql, $sth_attr) - : $dbh->prepare_cached($sql, $sth_attr, 3); + ? $dbh->prepare($sql) + : $dbh->prepare_cached($sql, {}, 3); # XXX You would think RaiseError would make this impossible, # but apparently that's not true :( @@ -2080,8 +2067,8 @@ sub _dbh_sth { } sub sth { - my ($self, $sql, $op, $sth_attr) = @_; - $self->dbh_do('_dbh_sth', $sql, $op, $sth_attr); # retry over disconnects + my ($self, $sql) = @_; + $self->dbh_do('_dbh_sth', $sql); # retry over disconnects } sub _dbh_columns_info_for { @@ -2624,6 +2611,33 @@ sub lag_behind_master { return; } +# SQLT version handling +{ + my $_sqlt_version_ok; # private + my $_sqlt_version_error; # private + + sub _sqlt_version_ok { + if (!defined $_sqlt_version_ok) { + eval "use SQL::Translator $minimum_sqlt_version"; + if ($@) { + $_sqlt_version_ok = 0; + $_sqlt_version_error = $@; + } + else { + $_sqlt_version_ok = 1; + } + } + return $_sqlt_version_ok; + } + + sub _sqlt_version_error { + shift->_sqlt_version_ok unless defined $_sqlt_version_ok; + return $_sqlt_version_error; + } + + sub _sqlt_minimum_version { $minimum_sqlt_version }; +} + sub DESTROY { my $self = shift;