From: Peter Rabbitson <ribasushi@cpan.org>
Date: Fri, 11 Sep 2009 22:44:01 +0000 (+0000)
Subject: This is how the txnguard should really work
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=c6e27318d1a83b7474eaea616d47d478746609f2;p=dbsrgits%2FDBIx-Class-Historic.git

This is how the txnguard should really work
---

diff --git a/examples/Schema/insertdb.pl b/examples/Schema/insertdb.pl
index 6ce1ed9..e8603bb 100644
--- a/examples/Schema/insertdb.pl
+++ b/examples/Schema/insertdb.pl
@@ -23,10 +23,10 @@ my %albums = (
 
 my @cds;
 foreach my $lp (keys %albums) {
-    my $artist = $schema->resultset('Artist')->search({
+    my $artist = $schema->resultset('Artist')->find({
         name => $albums{$lp}
     });
-    push @cds, [$lp, $artist->first];
+    push @cds, [$lp, $artist->id];
 }
 
 $schema->populate('Cd', [
diff --git a/lib/DBIx/Class/Storage/TxnScopeGuard.pm b/lib/DBIx/Class/Storage/TxnScopeGuard.pm
index 53ff96c..a9228c1 100644
--- a/lib/DBIx/Class/Storage/TxnScopeGuard.pm
+++ b/lib/DBIx/Class/Storage/TxnScopeGuard.pm
@@ -2,7 +2,7 @@ package DBIx::Class::Storage::TxnScopeGuard;
 
 use strict;
 use warnings;
-use Carp ();
+use Carp::Clan qw/^DBIx::Class/;
 
 sub new {
   my ($class, $storage) = @_;
@@ -24,7 +24,8 @@ sub DESTROY {
   return if $dismiss;
 
   my $exception = $@;
-  Carp::cluck("A DBIx::Class::Storage::TxnScopeGuard went out of scope without explicit commit or an error - bad")
+
+  carp 'A DBIx::Class::Storage::TxnScopeGuard went out of scope without explicit commit or error - bad'
     unless $exception;
 
   my $rollback_exception;
@@ -33,11 +34,15 @@ sub DESTROY {
     eval { $storage->txn_rollback };
     $rollback_exception = $@;
   }
+
   if ($rollback_exception && $rollback_exception !~ /DBIx::Class::Storage::NESTED_ROLLBACK_EXCEPTION/) {
-    $storage->throw_exception(
-        "Transaction aborted: ${exception} "
-        . "Rollback failed: ${rollback_exception}"
-    );
+    if ($exception) {
+      $@ = "Transaction aborted: ${exception} "
+          ."Rollback failed: ${rollback_exception}";
+    }
+    else {
+      carp "Rollback failed: ${rollback_exception}";
+    }
   }
 }
 
diff --git a/t/81transactions.t b/t/81transactions.t
index e539119..2c399b0 100644
--- a/t/81transactions.t
+++ b/t/81transactions.t
@@ -276,7 +276,7 @@ $schema->storage->disconnect;
       # 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');
+    }, qr/A DBIx::Class::Storage::TxnScopeGuard went out of scope without explicit commit or error/, 'Out of scope warning detected');
     ok(!$artist_rs->find({name => 'Death Cab for Cutie'}), "Artist not created");
   }, 'rollback successful withot exception');
 
@@ -329,4 +329,21 @@ $schema->storage->disconnect;
   }, qr/Deliberate exception.+Rollback failed/s);
 }
 
+# make sure it simply warns on failed rollbacks
+{
+  my $schema = DBICTest->init_schema();
+  warnings_exist (sub {
+    my $guard = $schema->txn_scope_guard;
+    $schema->resultset ('Artist')->create ({ name => 'bohhoo'});
+
+    $schema->storage->disconnect;  # this should freak out the guard rollback
+
+  },
+  [
+     qr/A DBIx::Class::Storage::TxnScopeGuard went out of scope without explicit commit or error/,
+     qr/Rollback failed/,
+  ],
+  'out-of-scope with failed rollback properly warned');
+}
+
 done_testing;