X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FStorage.pm;h=0e092ee4bbfbc439ffee73f6c6b3782dac2e5d05;hb=4cf392a17cae90f02305e0d122953b3927780d1c;hp=1895ab4c852af82bad45ba361431ed4d6b966152;hpb=ddf66ced51e4cb9b888001bc926bc0b3c3af0f8b;p=dbsrgits%2FDBIx-Class.git diff --git a/lib/DBIx/Class/Storage.pm b/lib/DBIx/Class/Storage.pm index 1895ab4..0e092ee 100644 --- a/lib/DBIx/Class/Storage.pm +++ b/lib/DBIx/Class/Storage.pm @@ -4,9 +4,10 @@ use strict; use warnings; use base qw/DBIx::Class/; +use mro 'c3'; -use Scalar::Util qw/weaken/; -use Carp::Clan qw/^DBIx::Class/; +use DBIx::Class::Exception; +use Scalar::Util(); use IO::File; use DBIx::Class::Storage::TxnScopeGuard; @@ -82,7 +83,7 @@ storage object, such as during L. sub set_schema { my ($self, $schema) = @_; $self->schema($schema); - weaken($self->{schema}) if ref $self->{schema}; + Scalar::Util::weaken($self->{schema}) if ref $self->{schema}; } =head2 connected @@ -119,8 +120,12 @@ Throws an exception - croaks. sub throw_exception { my $self = shift; - $self->schema->throw_exception(@_) if $self->schema; - croak @_; + if ($self->schema) { + $self->schema->throw_exception(@_); + } + else { + DBIx::Class::Exception->throw(@_); + } } =head2 txn_do @@ -153,16 +158,16 @@ For example, }; my $rs; - eval { + try { $rs = $schema->txn_do($coderef); - }; - - if ($@) { # Transaction failed + } catch { + my $error = shift; + # Transaction failed die "something terrible has happened!" # - if ($@ =~ /Rollback failed/); # Rollback failed + if ($error =~ /Rollback failed/); # Rollback failed deal_with_failed_transaction(); - } + }; In a nested transaction (calling txn_do() from within a txn_do() coderef) only the outermost transaction will issue a L, and txn_do() can be @@ -192,7 +197,7 @@ sub txn_do { my $wantarray = wantarray; # Need to save this since the context # inside the eval{} block is independent # of the context that called txn_do() - eval { + try { # Need to differentiate between scalar/list context to allow for # returning a list in scalar context to get the size of the list @@ -207,17 +212,13 @@ sub txn_do { $coderef->(@args); } $self->txn_commit; - }; - - if ($@) { - my $error = $@; + } catch { + my $error = shift; - eval { + try { $self->txn_rollback; - }; - - if ($@) { - my $rollback_error = $@; + } catch { + my $rollback_error = shift; my $exception_class = "DBIx::Class::Storage::NESTED_ROLLBACK_EXCEPTION"; $self->throw_exception($error) # propagate nested rollback if $rollback_error =~ /$exception_class/; @@ -225,9 +226,8 @@ sub txn_do { $self->throw_exception( "Transaction aborted: $error. Rollback failed: ${rollback_error}" ); - } else { - $self->throw_exception($error); # txn failed but rollback succeeded } + $self->throw_exception($error); # txn failed but rollback succeeded } return $wantarray ? @return_values : $return_value; @@ -248,6 +248,9 @@ sub txn_begin { die "Virtual method!" } Issues a commit of the current transaction. +It does I perform an actual storage commit unless there's a DBIx::Class +transaction currently in effect (i.e. you called L). + =cut sub txn_commit { die "Virtual method!" } @@ -264,10 +267,10 @@ sub txn_rollback { die "Virtual method!" } =head2 svp_begin -Arguments: $savepoint_name +Arguments: $savepoint_name? -Establishes a new savepoint of the specified name within the current -transaction. +Created a new savepoint using the name provided as argument. If no name +is provided, a random name will be used. =cut @@ -275,10 +278,11 @@ sub svp_begin { die "Virtual method!" } =head2 svp_release -Arguments: $savepoint_name +Arguments: $savepoint_name? -Destroy a savepoint, but keep the effects of the commands executed since -it's creation. +Release the savepoint provided as argument. If none is provided, +release the savepoint created most recently. This will implicitly +release all savepoints created after the one explicitly released as well. =cut @@ -286,28 +290,37 @@ sub svp_release { die "Virtual method!" } =head2 svp_rollback -Arguments: $savepoint_name +Arguments: $savepoint_name? -Rollback to the savepoint of the specified name. +Rollback to the savepoint provided as argument. If none is provided, +rollback to the savepoint created most recently. This will implicitly +release all savepoints created after the savepoint we rollback to. =cut sub svp_rollback { die "Virtual method!" } -=head2 svp_generate_name +=for comment -Generates a name for the next savepoint. Defaults to 'savepoint_$count', -where count is the number of current savepoints + 1. +=head2 txn_scope_guard -=cut +An alternative way of transaction handling based on +L: -sub svp_generate_name { die "Virtual method!" } + my $txn_guard = $storage->txn_scope_guard; -=for comment + $row->col1("val1"); + $row->update; -=head2 txn_scope_guard + $txn_guard->commit; -Return an object that does stuff. +If an exception occurs, or the guard object otherwise leaves the scope +before C<< $txn_guard->commit >> is called, the transaction will be rolled +back by an explicit L call. In essence this is akin to +using a L/L pair, without having to worry +about calling L at the right places. Note that since there +is no defined code closure, there will be no retries and other magic upon +database disconnection. If you need such functionality see L. =cut @@ -318,7 +331,7 @@ sub txn_scope_guard { =head2 sql_maker Returns a C object - normally an object of class -C. +C. =cut @@ -335,7 +348,7 @@ shell environment. =head2 debugfh Set or retrieve the filehandle used for trace/debug output. This should be -an IO::Handle compatible ojbect (only the C method is used. Initially +an IO::Handle compatible object (only the C method is used. Initially set to be STDERR - although see information on the L environment variable. @@ -475,7 +488,8 @@ Old name for DBIC_TRACE =head1 SEE ALSO -L - reference storage inplementation using SQL::Abstract and DBI. +L - reference storage implementation using +SQL::Abstract and DBI. =head1 AUTHORS