use strict;
use warnings;
use Try::Tiny;
-use Scalar::Util qw/weaken blessed/;
+use Scalar::Util qw/weaken blessed refaddr/;
+use DBIx::Class;
use DBIx::Class::Exception;
use DBIx::Class::Carp;
-
-# temporary until we fix the $@ issue in core
-# we also need a real appendable, stackable exception object
-# (coming soon)
-BEGIN {
- if ($] >= 5.013001 and $] <= 5.013007) {
- *IS_BROKEN_PERL = sub () { 1 };
- }
- else {
- *IS_BROKEN_PERL = sub () { 0 };
- }
-}
-
use namespace::clean;
my ($guards_count, $compat_handler, $foreign_handler);
sub new {
my ($class, $storage) = @_;
+ my $guard = {
+ inactivated => 0,
+ storage => $storage,
+ };
+
+ # we are starting with an already set $@ - in order for things to work we need to
+ # be able to recognize it upon destruction - store its weakref
+ # recording it before doing the txn_begin stuff
+ if (defined $@ and $@ ne '') {
+ $guard->{existing_exception_ref} = (ref $@ ne '') ? $@ : \$@;
+ weaken $guard->{existing_exception_ref};
+ }
+
$storage->txn_begin;
- my $guard = bless [ 0, $storage, $storage->_dbh ], ref $class || $class;
+ $guard->{dbh} = $storage->_dbh;
+ weaken $guard->{dbh};
+
+ bless $guard, ref $class || $class;
# install a callback carefully
- if (IS_BROKEN_PERL and !$guards_count) {
+ if (DBIx::Class::_ENV_::INVISIBLE_DOLLAR_AT and !$guards_count) {
# if the thrown exception is a plain string, wrap it in our
# own exception class
$guards_count++;
- weaken ($guard->[2]);
$guard;
}
sub commit {
my $self = shift;
- $self->[1]->txn_commit;
- $self->[0] = 1;
+ $self->{storage}->throw_exception("Refusing to execute multiple commits on scope guard $self")
+ if $self->{inactivated};
+
+ $self->{storage}->txn_commit;
+ $self->{inactivated} = 1;
}
sub DESTROY {
- my ($dismiss, $storage) = @{$_[0]};
+ my $self = shift;
$guards_count--;
# don't touch unless it's ours, and there are no more of us left
if (
- IS_BROKEN_PERL
+ DBIx::Class::_ENV_::INVISIBLE_DOLLAR_AT
and
!$guards_count
) {
undef $foreign_handler;
}
- return if $dismiss;
+ return if $self->{inactivated};
- # if our dbh is not ours anymore, the weakref will go undef
- $storage->_verify_pid;
- return unless $_[0]->[2];
+ # if our dbh is not ours anymore, the $dbh weakref will go undef
+ $self->{storage}->_verify_pid;
+ return unless $self->{dbh};
- my $exception = $@;
+ my $exception = $@ if (
+ defined $@
+ and
+ $@ ne ''
+ and
+ (
+ ! defined $self->{existing_exception_ref}
+ or
+ refaddr( ref $@ eq '' ? \$@ : $@ ) != refaddr($self->{existing_exception_ref})
+ )
+ );
{
local $@;
carp 'A DBIx::Class::Storage::TxnScopeGuard went out of scope without explicit commit or error. Rolling back.'
- unless $exception;
+ unless defined $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 }
+ try { $self->{storage}->_seems_connected && $self->{storage}->txn_rollback }
catch { $rollback_exception = shift };
- if (defined $rollback_exception && $rollback_exception !~ /DBIx::Class::Storage::NESTED_ROLLBACK_EXCEPTION/) {
+ if ( $rollback_exception and (
+ ! defined blessed $rollback_exception
+ or
+ ! $rollback_exception->isa('DBIx::Class::Storage::NESTED_ROLLBACK_EXCEPTION')
+ ) ) {
# append our text - THIS IS A TEMPORARY FIXUP!
# a real stackable exception object is in the works
if (ref $exception eq 'DBIx::Class::Exception') {
}
}
- $@ = $exception unless IS_BROKEN_PERL;
+ $@ = $exception unless DBIx::Class::_ENV_::INVISIBLE_DOLLAR_AT;
}
1;