X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FStorage%2FDBI.pm;h=5156731a04511746724f6c85280b876a9f9fab2d;hb=ddfd085d3ec95031b148d573ccc2e6cd36032b9d;hp=20c1b1a17f71a5a369d968bb6f9375cb37e0b0db;hpb=4cf392a17cae90f02305e0d122953b3927780d1c;p=dbsrgits%2FDBIx-Class.git diff --git a/lib/DBIx/Class/Storage/DBI.pm b/lib/DBIx/Class/Storage/DBI.pm index 20c1b1a..5156731 100644 --- a/lib/DBIx/Class/Storage/DBI.pm +++ b/lib/DBIx/Class/Storage/DBI.pm @@ -11,19 +11,18 @@ use Carp::Clan qw/^DBIx::Class/; use DBI; use DBIx::Class::Storage::DBI::Cursor; use DBIx::Class::Storage::Statistics; -use Scalar::Util(); -use List::Util(); -use Data::Dumper::Concise(); -use Sub::Name (); +use Scalar::Util qw/refaddr weaken reftype blessed/; +use Data::Dumper::Concise 'Dumper'; +use Sub::Name 'subname'; use Try::Tiny; +use File::Path 'make_path'; +use namespace::clean; -use File::Path (); - -__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 - _server_info_hash/ -); +__PACKAGE__->mk_group_accessors('simple' => qw/ + _connect_info _dbi_connect_info _dbic_connect_attributes _driver_determined + _dbh _server_info_hash _conn_pid _conn_tid _sql_maker _sql_maker_opts + transaction_depth _dbh_autocommit savepoints +/); # the values for these accessors are picked out (and deleted) from # the attribute hashref passed to connect_info @@ -67,7 +66,7 @@ for my $meth (@rdbms_specific_methods) { no strict qw/refs/; no warnings qw/redefine/; - *{__PACKAGE__ ."::$meth"} = Sub::Name::subname $meth => sub { + *{__PACKAGE__ ."::$meth"} = subname $meth => sub { if (not $_[0]->_driver_determined) { $_[0]->_determine_driver; goto $_[0]->can($meth); @@ -582,6 +581,11 @@ sub connect_info { $self->_dbi_connect_info([@args, %attrs && !(ref $args[0] eq 'CODE') ? \%attrs : ()]); + # FIXME - dirty: + # save attributes them in a separate accessor so they are always + # introspectable, even in case of a CODE $dbhmaker + $self->_dbic_connect_attributes (\%attrs); + return $self->_connect_info; } @@ -723,41 +727,26 @@ sub dbh_do { my $dbh = $self->_get_dbh; - return $self->$code($dbh, @_) if $self->{_in_dbh_do} - || $self->{transaction_depth}; + return $self->$code($dbh, @_) + if ( $self->{_in_dbh_do} || $self->{transaction_depth} ); local $self->{_in_dbh_do} = 1; - my @result; - my $want_array = wantarray; - - my $exception; - my @args = @_; - try { - - if($want_array) { - @result = $self->$code($dbh, @args); - } - elsif(defined $want_array) { - $result[0] = $self->$code($dbh, @args); - } - else { - $self->$code($dbh, @args); - } + # take a ref instead of a copy, to preserve coderef @_ aliasing semantics + my $args = \@_; + return try { + $self->$code ($dbh, @$args); } catch { - $exception = shift; - }; + $self->throw_exception($_) if $self->connected; - if(! defined $exception) { return $want_array ? @result : $result[0] } - - $self->throw_exception($exception) if $self->connected; + # We were not connected - reconnect and retry, but let any + # exception fall right through this time + carp "Retrying $code after catching disconnected exception: $_" + if $ENV{DBIC_DBIRETRY_DEBUG}; - # We were not connected - reconnect and retry, but let any - # exception fall right through this time - carp "Retrying $code after catching disconnected exception: $exception" - if $ENV{DBIC_DBIRETRY_DEBUG}; - $self->_populate_dbh; - $self->$code($self->_dbh, @_); + $self->_populate_dbh; + $self->$code($self->_dbh, @$args); + }; } # This is basically a blend of dbh_do above and DBIx::Class::Storage::txn_do. @@ -780,19 +769,22 @@ sub txn_do { my $tried = 0; while(1) { my $exception; - my @args = @_; + + # take a ref instead of a copy, to preserve coderef @_ aliasing semantics + my $args = \@_; + try { $self->_get_dbh; $self->txn_begin; if($want_array) { - @result = $coderef->(@args); + @result = $coderef->(@$args); } elsif(defined $want_array) { - $result[0] = $coderef->(@args); + $result[0] = $coderef->(@$args); } else { - $coderef->(@args); + $coderef->(@$args); } $self->txn_commit; } catch { @@ -1017,10 +1009,7 @@ sub _server_info { my %info; - my $server_version = do { - local $@; # might be happenin in some sort of destructor - try { $self->_get_server_version }; - }; + my $server_version = try { $self->_get_server_version }; if (defined $server_version) { $info{dbms_version} = $server_version; @@ -1070,7 +1059,7 @@ sub _determine_driver { } else { # if connect_info is a CODEREF, we have no choice but to connect if (ref $self->_dbi_connect_info->[0] && - Scalar::Util::reftype($self->_dbi_connect_info->[0]) eq 'CODE') { + reftype $self->_dbi_connect_info->[0] eq 'CODE') { $self->_populate_dbh; $driver = $self->_dbh->{Driver}{Name}; } @@ -1177,8 +1166,9 @@ sub _connect { $DBI::connect_via = 'connect'; } - my $exception; - try { + # FIXME - this should have been Try::Tiny, but triggers a leak-bug in perl(!) + # related to coderef refcounting. A failing test has been submitted to T::T + my $connect_ok = eval { if(ref $info[0] eq 'CODE') { $dbh = $info[0]->(); } @@ -1186,9 +1176,13 @@ sub _connect { $dbh = DBI->connect(@info); } - if($dbh && !$self->unsafe) { + if (!$dbh) { + die $DBI::errstr; + } + + unless ($self->unsafe) { my $weak_self = $self; - Scalar::Util::weaken($weak_self); + weaken $weak_self; $dbh->{HandleError} = sub { if ($weak_self) { $weak_self->throw_exception("DBI Exception: $_[0]"); @@ -1203,17 +1197,18 @@ sub _connect { $dbh->{RaiseError} = 1; $dbh->{PrintError} = 0; } - } catch { - $exception = $_; + + 1; }; + my $possible_err = $@; $DBI::connect_via = $old_connect_via if $old_connect_via; - $self->throw_exception("DBI Connection failed: " . ((defined $exception && $exception) || $DBI::errstr)) - if !$dbh || defined $exception; + unless ($connect_ok) { + $self->throw_exception("DBI Connection failed: $possible_err") + } $self->_dbh_autocommit($dbh->{AutoCommit}); - $dbh; } @@ -1379,14 +1374,17 @@ sub txn_rollback { else { die DBIx::Class::Storage::NESTED_ROLLBACK_EXCEPTION->new; } - } catch { - my $error = shift; - my $exception_class = "DBIx::Class::Storage::NESTED_ROLLBACK_EXCEPTION"; - $error =~ /$exception_class/ and $self->throw_exception($error); - # ensure that a failed rollback resets the transaction depth - $self->{transaction_depth} = $self->_dbh_autocommit ? 0 : 1; - $self->throw_exception($error); } + catch { + my $exception_class = "DBIx::Class::Storage::NESTED_ROLLBACK_EXCEPTION"; + + if ($_ !~ /$exception_class/) { + # ensure that a failed rollback resets the transaction depth + $self->{transaction_depth} = $self->_dbh_autocommit ? 0 : 1; + } + + $self->throw_exception($_) + }; } sub _dbh_rollback { @@ -1402,7 +1400,7 @@ sub _dbh_rollback { sub _prep_for_execute { my ($self, $op, $extra_bind, $ident, $args) = @_; - if( Scalar::Util::blessed($ident) && $ident->isa("DBIx::Class::ResultSource") ) { + if( blessed $ident && $ident->isa("DBIx::Class::ResultSource") ) { $ident = $ident->from(); } @@ -1481,7 +1479,9 @@ sub _dbh_execute { # Can this fail without throwing an exception anyways??? my $rv = $sth->execute(); - $self->throw_exception($sth->errstr) if !$rv; + $self->throw_exception( + $sth->errstr || $sth->err || 'Unknown error: execute() returned false, but error flags were not set...' + ) if !$rv; $self->_query_end( $sql, @$bind ); @@ -1528,7 +1528,7 @@ sub insert { if ($opts->{returning}) { my @ret_cols = @{$opts->{returning}}; - my @ret_vals = eval { + my @ret_vals = try { local $SIG{__WARN__} = sub {}; my @r = $sth->fetchrow_array; $sth->finish; @@ -1571,9 +1571,9 @@ sub insert_bulk { $cols->[$col_idx], do { local $Data::Dumper::Maxdepth = 1; # don't dump objects, if any - Data::Dumper::Concise::Dumper({ + Dumper { map { $cols->[$_] => $data->[$slice_idx][$_] } (0 .. $#$cols) - }), + }, } ); }; @@ -1683,18 +1683,25 @@ sub _execute_array { $placeholder_index++; } - my $rv; - my $err; + my ($rv, $err); try { $rv = $self->_dbh_execute_array($sth, $tuple_status, @extra); - } catch { + } + catch { $err = shift; + } + finally { + # Statement must finish even if there was an exception. + try { + $sth->finish + } + catch { + $err = shift unless defined $err + }; }; - $err = defined $err ? $err : ($sth->err ? $sth->errstr : undef ); -# Statement must finish even if there was an exception. - try { $sth->finish } - catch { $err = shift unless defined $err }; + $err = $sth->errstr + if (! defined $err and $sth->err); if (defined $err) { my $i = 0; @@ -1705,11 +1712,10 @@ sub _execute_array { $self->throw_exception(sprintf "%s for populate slice:\n%s", ($tuple_status->[$i][1] || $err), - Data::Dumper::Concise::Dumper({ - map { $cols->[$_] => $data->[$i][$_] } (0 .. $#$cols) - }), + Dumper { map { $cols->[$_] => $data->[$i][$_] } (0 .. $#$cols) }, ); } + return $rv; } @@ -1722,25 +1728,28 @@ sub _dbh_execute_array { sub _dbh_execute_inserts_with_no_binds { my ($self, $sth, $count) = @_; - my $exception; + my $err; try { my $dbh = $self->_get_dbh; local $dbh->{RaiseError} = 1; local $dbh->{PrintError} = 0; $sth->execute foreach 1..$count; - } catch { - $exception = shift; - }; - -# Make sure statement is finished even if there was an exception. - try { - $sth->finish - } catch { - $exception = shift unless defined $exception; + } + catch { + $err = shift; + } + finally { + # Make sure statement is finished even if there was an exception. + try { + $sth->finish + } + catch { + $err = shift unless defined $err; + }; }; - $self->throw_exception($exception) if defined $exception; + $self->throw_exception($err) if defined $err; return $count; } @@ -1927,19 +1936,13 @@ sub _select_args { } # adjust limits - if ( - $attrs->{software_limit} - || - $sql_maker->_default_limit_syntax eq "GenericSubQ" - ) { - $attrs->{software_limit} = 1; - } - else { + if (defined $attrs->{rows}) { $self->throw_exception("rows attribute must be positive if present") - if (defined($attrs->{rows}) && !($attrs->{rows} > 0)); - + unless $attrs->{rows} > 0; + } + elsif (defined $attrs->{offset}) { # MySQL actually recommends this approach. I cringe. - $attrs->{rows} = 2**48 if not defined $attrs->{rows} and defined $attrs->{offset}; + $attrs->{rows} = $sql_maker->__max_int; } my @limit; @@ -2144,7 +2147,7 @@ Return the row id of the last insert. sub _dbh_last_insert_id { my ($self, $dbh, $source, $col) = @_; - my $id = eval { $dbh->last_insert_id (undef, undef, $source->name, $col) }; + my $id = try { $dbh->last_insert_id (undef, undef, $source->name, $col) }; return $id if defined $id; @@ -2195,15 +2198,15 @@ sub _placeholders_supported { # some drivers provide a $dbh attribute (e.g. Sybase and $dbh->{syb_dynamic_supported}) # but it is inaccurate more often than not - my $rc = 1; - try { + return try { local $dbh->{PrintError} = 0; local $dbh->{RaiseError} = 1; $dbh->do('select ?', {}, 1); - } catch { - $rc = 0; + 1; + } + catch { + 0; }; - return $rc; } # Check if placeholders bound to non-string types throw exceptions @@ -2212,16 +2215,16 @@ sub _typeless_placeholders_supported { my $self = shift; my $dbh = $self->_get_dbh; - my $rc = 1; - try { + return try { local $dbh->{PrintError} = 0; local $dbh->{RaiseError} = 1; # this specifically tests a bind that is NOT a string $dbh->do('select 1 where 1 = ?', {}, 1); - } catch { - $rc = 0; + 1; + } + catch { + 0; }; - return $rc; } =head2 sqlt_type @@ -2333,8 +2336,13 @@ sub create_ddl_dir { carp "No directory given, using ./\n"; $dir = './'; } else { - -d $dir or File::Path::mkpath($dir) - or $self->throw_exception("create_ddl_dir: $! creating dir '$dir'"); + -d $dir + or + make_path ("$dir") # make_path does not like objects (i.e. Path::Class::Dir) + or + $self->throw_exception( + "Failed to create '$dir': " . ($! || $@ || 'error unknow') + ); } $self->throw_exception ("Directory '$dir' does not exist\n") unless(-d $dir); @@ -2543,7 +2551,7 @@ sub deploy { # place (even though we will ignore errors) $self->dbh_do (sub { $_[1]->do($line) }); } catch { - carp qq{$@ (running "${line}")}; + carp qq{$_ (running "${line}")}; }; $self->_query_end($line); };