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::Exception;
+use DBIx::Class::_Util qw(is_exception detect_reinvoked_destructor);
use DBIx::Class::Carp;
use namespace::clean;
-my ($guards_count, $compat_handler, $foreign_handler);
-
sub new {
my ($class, $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};
+ #
+ # 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;
- # install a callback carefully
- 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
- # this is actually a pretty cool idea, may very well keep it
- # after perl is fixed
- $compat_handler ||= bless(
- sub {
- $@ = (blessed($_[0]) or ref($_[0]))
- ? $_[0]
- : bless ( { msg => $_[0] }, 'DBIx::Class::Exception')
- ;
- die;
- },
- '__TxnScopeGuard__FIXUP__',
- );
-
- if ($foreign_handler = $SIG{__DIE__}) {
- $SIG{__DIE__} = bless (
- sub {
- # we trust the foreign handler to do whatever it wants, all we do is set $@
- eval { $compat_handler->(@_) };
- $foreign_handler->(@_);
- },
- '__TxnScopeGuard__FIXUP__',
- );
- }
- else {
- $SIG{__DIE__} = $compat_handler;
- }
- }
-
- $guards_count++;
-
$guard;
}
}
sub DESTROY {
- my $self = shift;
-
- $guards_count--;
+ return if &detect_reinvoked_destructor;
- # don't touch unless it's ours, and there are no more of us left
- if (
- DBIx::Class::_ENV_::INVISIBLE_DOLLAR_AT
- and
- !$guards_count
- ) {
-
- if (ref $SIG{__DIE__} eq '__TxnScopeGuard__FIXUP__') {
- # restore what we saved
- if ($foreign_handler) {
- $SIG{__DIE__} = $foreign_handler;
- }
- else {
- delete $SIG{__DIE__};
- }
- }
-
- # make sure we do not leak the foreign one in case it exists
- undef $foreign_handler;
- }
+ my $self = shift;
return if $self->{inactivated};
# if our dbh is not ours anymore, the $dbh weakref will go undef
- $self->{storage}->_verify_pid;
+ $self->{storage}->_verify_pid unless DBIx::Class::_ENV_::BROKEN_FORK;
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})
)
);
}
}
- $@ = $exception unless DBIx::Class::_ENV_::INVISIBLE_DOLLAR_AT;
+ $@ = $exception;
}
1;
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>.