From: Brandon L. Black Date: Tue, 8 Aug 2006 00:44:42 +0000 (+0000) Subject: move txn_do to Storage X-Git-Tag: v0.08010~43^2~35 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=4012acd8f58480ab7729933dc9078c5f2a6feef2;hp=67a0df4fb01cb1c5c0e960ff9b289e9326c38a70;p=dbsrgits%2FDBIx-Class.git move txn_do to Storage --- diff --git a/lib/DBIx/Class/Schema.pm b/lib/DBIx/Class/Schema.pm index 3641f3c..6eb18ba 100644 --- a/lib/DBIx/Class/Schema.pm +++ b/lib/DBIx/Class/Schema.pm @@ -477,138 +477,84 @@ information. sub connect { shift->clone->connection(@_) } -=head2 txn_begin +=head2 txn_do -Begins a transaction (does nothing if AutoCommit is off). Equivalent to -calling $schema->storage->txn_begin. See -L for more information. +=over 4 -=cut +=item Arguments: C<$coderef>, @coderef_args? -sub txn_begin { shift->storage->txn_begin } +=item Return Value: The return value of $coderef -=head2 txn_commit +=back -Commits the current transaction. Equivalent to calling -$schema->storage->txn_commit. See L -for more information. +Executes C<$coderef> with (optional) arguments C<@coderef_args> atomically, +returning its result (if any). Equivalent to calling $schema->storage->txn_do. +See L for more information. -=cut +This interface is preferred over using the individual methods L, +L, and L below. -sub txn_commit { shift->storage->txn_commit } +=cut -=head2 txn_rollback +sub txn_do { + my $self = shift; -Rolls back the current transaction. Equivalent to calling -$schema->storage->txn_rollback. See -L for more information. + $self->storage or $self->throw_exception + ('txn_do called on $schema without storage'); -=cut + $self->storage->txn_do(@_); +} -sub txn_rollback { shift->storage->txn_rollback } -=head2 txn_do +=head2 txn_begin -=over 4 +Begins a transaction (does nothing if AutoCommit is off). Equivalent to +calling $schema->storage->txn_begin. See +L for more information. -=item Arguments: C<$coderef>, @coderef_args? +=cut -=item Return Value: The return value of $coderef +sub txn_begin { + my $self = shift; -=back + $self->storage or $self->throw_exception + ('txn_begin called on $schema without storage'); -Executes C<$coderef> with (optional) arguments C<@coderef_args> atomically, -returning its result (if any). If an exception is caught, a rollback is issued -and the exception is rethrown. If the rollback fails, (i.e. throws an -exception) an exception is thrown that includes a "Rollback failed" message. + $self->storage->txn_begin; +} -For example, +=head2 txn_commit - my $author_rs = $schema->resultset('Author')->find(1); - my @titles = qw/Night Day It/; +Commits the current transaction. Equivalent to calling +$schema->storage->txn_commit. See L +for more information. - my $coderef = sub { - # If any one of these fails, the entire transaction fails - $author_rs->create_related('books', { - title => $_ - }) foreach (@titles); +=cut - return $author->books; - }; +sub txn_commit { + my $self = shift; - my $rs; - eval { - $rs = $schema->txn_do($coderef); - }; + $self->storage or $self->throw_exception + ('txn_commit called on $schema without storage'); - if ($@) { # Transaction failed - die "something terrible has happened!" # - if ($@ =~ /Rollback failed/); # Rollback failed + $self->storage->txn_commit; +} - deal_with_failed_transaction(); - } +=head2 txn_rollback -In a nested transaction (calling txn_do() from within a txn_do() coderef) only -the outermost transaction will issue a L on -the Schema's storage, and txn_do() can be called in void, scalar and list -context and it will behave as expected. +Rolls back the current transaction. Equivalent to calling +$schema->storage->txn_rollback. See +L for more information. =cut -sub txn_do { - my ($self, $coderef, @args) = @_; +sub txn_rollback { + my $self = shift; $self->storage or $self->throw_exception - ('txn_do called on $schema without storage'); - ref $coderef eq 'CODE' or $self->throw_exception - ('$coderef must be a CODE reference'); - - my (@return_values, $return_value); - - $self->txn_begin; # If this throws an exception, no rollback is needed - - my $wantarray = wantarray; # Need to save this since the context - # inside the eval{} block is independent - # of the context that called txn_do() - eval { - - # Need to differentiate between scalar/list context to allow for - # returning a list in scalar context to get the size of the list - if ($wantarray) { - # list context - @return_values = $coderef->(@args); - } elsif (defined $wantarray) { - # scalar context - $return_value = $coderef->(@args); - } else { - # void context - $coderef->(@args); - } - $self->txn_commit; - }; - - if ($@) { - my $error = $@; - - eval { - $self->txn_rollback; - }; - - if ($@) { - my $rollback_error = $@; - my $exception_class = "DBIx::Class::Storage::NESTED_ROLLBACK_EXCEPTION"; - $self->throw_exception($error) # propagate nested rollback - if $rollback_error =~ /$exception_class/; - - $self->throw_exception( - "Transaction aborted: $error. Rollback failed: ${rollback_error}" - ); - } else { - $self->throw_exception($error); # txn failed but rollback succeeded - } - } + ('txn_rollback called on $schema without storage'); - return $wantarray ? @return_values : $return_value; + $self->storage->txn_rollback; } =head2 clone diff --git a/lib/DBIx/Class/Storage.pm b/lib/DBIx/Class/Storage.pm index 2efc930..973f31b 100644 --- a/lib/DBIx/Class/Storage.pm +++ b/lib/DBIx/Class/Storage.pm @@ -1,9 +1,23 @@ -package # hide from PAUSE - DBIx::Class::Storage; +package DBIx::Class::Storage; use strict; use warnings; +package # Hide from PAUSE + DBIx::Class::Storage::NESTED_ROLLBACK_EXCEPTION; + +use overload '"' => sub { + 'DBIx::Class::Storage::NESTED_ROLLBACK_EXCEPTION' +}; + +sub new { + my $class = shift; + my $self = {}; + return bless $self, $class; +} + +package DBIx::Class::Storage; + sub new { die "Virtual method!" } sub set_schema { die "Virtual method!" } sub debug { die "Virtual method!" } @@ -26,18 +40,107 @@ sub delete { die "Virtual method!" } sub select { die "Virtual method!" } sub select_single { die "Virtual method!" } sub columns_info_for { die "Virtual method!" } +sub throw_exception { die "Virtual method!" } +=head2 txn_do -package DBIx::Class::Storage::NESTED_ROLLBACK_EXCEPTION; +=over 4 -use overload '"' => sub { - 'DBIx::Class::Storage::NESTED_ROLLBACK_EXCEPTION' -}; +=item Arguments: C<$coderef>, @coderef_args? -sub new { - my $class = shift; - my $self = {}; - return bless $self, $class; +=item Return Value: The return value of $coderef + +=back + +Executes C<$coderef> with (optional) arguments C<@coderef_args> atomically, +returning its result (if any). If an exception is caught, a rollback is issued +and the exception is rethrown. If the rollback fails, (i.e. throws an +exception) an exception is thrown that includes a "Rollback failed" message. + +For example, + + my $author_rs = $schema->resultset('Author')->find(1); + my @titles = qw/Night Day It/; + + my $coderef = sub { + # If any one of these fails, the entire transaction fails + $author_rs->create_related('books', { + title => $_ + }) foreach (@titles); + + return $author->books; + }; + + my $rs; + eval { + $rs = $schema->txn_do($coderef); + }; + + if ($@) { # Transaction failed + die "something terrible has happened!" # + if ($@ =~ /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 +called in void, scalar and list context and it will behave as expected. + +=cut + +sub txn_do { + my ($self, $coderef, @args) = @_; + + ref $coderef eq 'CODE' or $self->throw_exception + ('$coderef must be a CODE reference'); + + my (@return_values, $return_value); + + $self->txn_begin; # If this throws an exception, no rollback is needed + + my $wantarray = wantarray; # Need to save this since the context + # inside the eval{} block is independent + # of the context that called txn_do() + eval { + + # Need to differentiate between scalar/list context to allow for + # returning a list in scalar context to get the size of the list + if ($wantarray) { + # list context + @return_values = $coderef->(@args); + } elsif (defined $wantarray) { + # scalar context + $return_value = $coderef->(@args); + } else { + # void context + $coderef->(@args); + } + $self->txn_commit; + }; + + if ($@) { + my $error = $@; + + eval { + $self->txn_rollback; + }; + + if ($@) { + my $rollback_error = $@; + my $exception_class = "DBIx::Class::Storage::NESTED_ROLLBACK_EXCEPTION"; + $self->throw_exception($error) # propagate nested rollback + if $rollback_error =~ /$exception_class/; + + $self->throw_exception( + "Transaction aborted: $error. Rollback failed: ${rollback_error}" + ); + } else { + $self->throw_exception($error); # txn failed but rollback succeeded + } + } + + return $wantarray ? @return_values : $return_value; } 1; diff --git a/t/81transactions.t b/t/81transactions.t index 5434387..4a7830f 100644 --- a/t/81transactions.t +++ b/t/81transactions.t @@ -118,7 +118,7 @@ my $fail_code = sub { # Force txn_rollback() to throw an exception no warnings 'redefine'; no strict 'refs'; - local *{"DBIx::Class::Schema::txn_rollback"} = sub{die 'FAILED'}; + local *{"DBIx::Class::Storage::DBI::SQLite::txn_rollback"} = sub{die 'FAILED'}; eval { $schema->txn_do($fail_code, $artist);