From: Peter Rabbitson Date: Fri, 11 Sep 2009 13:39:42 +0000 (+0000) Subject: Fixed minor problem with txn scope guard - rollback exceptions were never reported X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=d7ded411cdeee27c550335d900c630a2e5989d0b;p=dbsrgits%2FDBIx-Class-Historic.git Fixed minor problem with txn scope guard - rollback exceptions were never reported --- diff --git a/lib/DBIx/Class/Storage/TxnScopeGuard.pm b/lib/DBIx/Class/Storage/TxnScopeGuard.pm index 1c2a070..53ff96c 100644 --- a/lib/DBIx/Class/Storage/TxnScopeGuard.pm +++ b/lib/DBIx/Class/Storage/TxnScopeGuard.pm @@ -25,19 +25,19 @@ sub DESTROY { my $exception = $@; Carp::cluck("A DBIx::Class::Storage::TxnScopeGuard went out of scope without explicit commit or an error - bad") - unless $exception; + unless $exception; + + my $rollback_exception; { local $@; eval { $storage->txn_rollback }; - my $rollback_exception = $@; - if($rollback_exception) { - my $exception_class = "DBIx::Class::Storage::NESTED_ROLLBACK_EXCEPTION"; - - $storage->throw_exception( - "Transaction aborted: ${exception}. " + $rollback_exception = $@; + } + if ($rollback_exception && $rollback_exception !~ /DBIx::Class::Storage::NESTED_ROLLBACK_EXCEPTION/) { + $storage->throw_exception( + "Transaction aborted: ${exception} " . "Rollback failed: ${rollback_exception}" - ) unless $rollback_exception =~ /$exception_class/; - } + ); } } diff --git a/t/81transactions.t b/t/81transactions.t index 32d5f17..e539119 100644 --- a/t/81transactions.t +++ b/t/81transactions.t @@ -1,23 +1,22 @@ use strict; -use warnings; +use warnings; use Test::More; +use Test::Warn; use Test::Exception; use lib qw(t/lib); use DBICTest; my $schema = DBICTest->init_schema(); -plan tests => 64; - my $code = sub { my ($artist, @cd_titles) = @_; - + $artist->create_related('cds', { title => $_, year => 2006, }) foreach (@cd_titles); - + return $artist->cds->all; }; @@ -258,13 +257,13 @@ $schema->storage->disconnect; name => 'Death Cab for Cutie', made_up_column => 1, }); - + $guard->commit; } qr/No such column made_up_column .*? at .*?81transactions.t line \d+/s, "Error propogated okay"; ok(!$artist_rs->find({name => 'Death Cab for Cutie'}), "Artist not created"); - my $inner_exception; + my $inner_exception; # set in inner() below eval { outer($schema, 1); }; @@ -273,14 +272,11 @@ $schema->storage->disconnect; ok(!$artist_rs->find({name => 'Death Cab for Cutie'}), "Artist not created"); lives_ok (sub { - my $w; - local $SIG{__WARN__} = sub { $w = shift }; - - # The 0 arg says don't die, just let the scope guard go out of scope - # forcing a txn_rollback to happen - outer($schema, 0); - - like ($w, qr/A DBIx::Class::Storage::TxnScopeGuard went out of scope without explicit commit or an error/, 'Out of scope warning detected'); + warnings_exist ( sub { + # The 0 arg says don't die, just let the scope guard go out of scope + # forcing a txn_rollback to happen + outer($schema, 0); + }, qr/A DBIx::Class::Storage::TxnScopeGuard went out of scope without explicit commit or an error/, 'Out of scope warning detected'); ok(!$artist_rs->find({name => 'Death Cab for Cutie'}), "Artist not created"); }, 'rollback successful withot exception'); @@ -319,3 +315,18 @@ $schema->storage->disconnect; $inner_guard->commit; } } + +# make sure the guard does not eat exceptions +{ + my $schema = DBICTest->init_schema(); + throws_ok (sub { + my $guard = $schema->txn_scope_guard; + $schema->resultset ('Artist')->create ({ name => 'bohhoo'}); + + $schema->storage->disconnect; # this should freak out the guard rollback + + die 'Deliberate exception'; + }, qr/Deliberate exception.+Rollback failed/s); +} + +done_testing;