use strict;
use warnings;
use Carp::Clan qw/^DBIx::Class/;
+use Try::Tiny;
+use Scalar::Util qw/weaken/;
+use namespace::clean;
sub new {
my ($class, $storage) = @_;
$storage->txn_begin;
- bless [ 0, $storage ], ref $class || $class;
+ my $guard = bless [ 0, $storage, $storage->_dbh ], ref $class || $class;
+ weaken ($guard->[2]);
+ $guard;
}
sub commit {
return if $dismiss;
+ # if our dbh is not ours anymore, the weakref will go undef
+ $storage->_preserve_foreign_dbh;
+ return unless $_[0]->[2];
+
my $exception = $@;
{
carp 'A DBIx::Class::Storage::TxnScopeGuard went out of scope without explicit commit or error. Rolling back.'
unless $exception;
- eval { $storage->txn_rollback };
- my $rollback_exception = $@;
+ my $rollback_exception;
+ # do minimal connectivity check due to weird shit like
+ # https://rt.cpan.org/Public/Bug/Display.html?id=62370
+ try { $storage->_seems_connected && $storage->txn_rollback }
+ catch { $rollback_exception = shift };
- if ($rollback_exception && $rollback_exception !~ /DBIx::Class::Storage::NESTED_ROLLBACK_EXCEPTION/) {
+ if (defined $rollback_exception && $rollback_exception !~ /DBIx::Class::Storage::NESTED_ROLLBACK_EXCEPTION/) {
if ($exception) {
$exception = "Transaction aborted: ${exception} "
."Rollback failed: ${rollback_exception}";
=head1 DESCRIPTION
An object that behaves much like L<Scope::Guard>, but hardcoded to do the
-right thing with transactions in DBIx::Class.
+right thing with transactions in DBIx::Class.
=head1 METHODS