use strict;
use warnings;
use Try::Tiny;
-use Scalar::Util qw/weaken blessed refaddr/;
+use Scalar::Util qw(weaken blessed refaddr);
use DBIx::Class;
+use DBIx::Class::_Util qw(is_exception detect_reinvoked_destructor);
use DBIx::Class::Carp;
use namespace::clean;
# 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};
+ #
+ # FIXME FRAGILE - any eval that fails but *does not* rethrow between here
+ # and the unwind will trample over $@ and invalidate the entire mechanism
+ # There got to be a saner way of doing this...
+ if (is_exception $@) {
+ weaken(
+ $guard->{existing_exception_ref} = (ref($@) eq '') ? \$@ : $@
+ );
}
$storage->txn_begin;
- $guard->{dbh} = $storage->_dbh;
- weaken $guard->{dbh};
+ weaken( $guard->{dbh} = $storage->_dbh );
bless $guard, ref $class || $class;
}
sub DESTROY {
+ return if &detect_reinvoked_destructor;
+
my $self = shift;
return if $self->{inactivated};
return unless $self->{dbh};
my $exception = $@ if (
- defined $@
- and
- $@ ne ''
+ is_exception $@
and
(
! defined $self->{existing_exception_ref}
or
- refaddr( ref $@ eq '' ? \$@ : $@ ) != refaddr($self->{existing_exception_ref})
+ refaddr( ref($@) eq '' ? \$@ : $@ ) != refaddr($self->{existing_exception_ref})
)
);
L<DBIx::Class::Schema/txn_scope_guard>.
-=head1 AUTHOR
+L<Scope::Guard> by chocolateboy (inspiration for this module)
-Ash Berlin, 2008.
+=head1 FURTHER QUESTIONS?
-Inspired by L<Scope::Guard> by chocolateboy.
+Check the list of L<additional DBIC resources|DBIx::Class/GETTING HELP/SUPPORT>.
-This module is free software. It may be used, redistributed and/or modified
-under the same terms as Perl itself.
+=head1 COPYRIGHT AND LICENSE
-=cut
+This module is free software L<copyright|DBIx::Class/COPYRIGHT AND LICENSE>
+by the L<DBIx::Class (DBIC) authors|DBIx::Class/AUTHORS>. You can
+redistribute it and/or modify it under the same terms as the
+L<DBIx::Class library|DBIx::Class/COPYRIGHT AND LICENSE>.