From: Ash Berlin Date: Sun, 1 Jun 2008 10:28:14 +0000 (+0000) Subject: Prepare for new dev release X-Git-Tag: v0.08240~433 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=a211cb63c765b996706779e04685f982c4c5eb81;p=dbsrgits%2FDBIx-Class.git Prepare for new dev release --- diff --git a/lib/DBIx/Class.pm b/lib/DBIx/Class.pm index 705b8b0..75bedf6 100644 --- a/lib/DBIx/Class.pm +++ b/lib/DBIx/Class.pm @@ -24,7 +24,7 @@ sub component_base_class { 'DBIx::Class' } # i.e. first release of 0.XX *must* be 0.XX000. This avoids fBSD ports # brain damage and presumably various other packaging systems too -$VERSION = '0.08099_01'; +$VERSION = '0.08099_02'; $VERSION = eval $VERSION; # numify for warning-free dev releases diff --git a/lib/DBIx/Class/Storage/TxnScopeGuard.pm b/lib/DBIx/Class/Storage/TxnScopeGuard.pm index 5745870..ca7cad7 100644 --- a/lib/DBIx/Class/Storage/TxnScopeGuard.pm +++ b/lib/DBIx/Class/Storage/TxnScopeGuard.pm @@ -18,19 +18,13 @@ sub commit { $self->[0] = 1; } -sub dismiss { - my $self = shift; - - $self->[0] = 1; -} - sub DESTROY { my ($dismiss, $storage) = @{$_[0]}; return if $dismiss; my $exception = $@; - Carp::cluck("A DBIx::Class:: went out of scope without explicit commit/dismiss") + Carp::cluck("A DBIx::Class::Storage::TxnScopeGuard went out of scope without explicit commit or an error - bad") unless $exception; { local $@; @@ -53,7 +47,7 @@ __END__ =head1 NAME -DBIx::Class::Storage::TxnScopeGuard +DBIx::Class::Storage::TxnScopeGuard - Experimental =head1 SYNOPSIS diff --git a/t/81transactions.t b/t/81transactions.t index 2b409fa..7d30b5c 100644 --- a/t/81transactions.t +++ b/t/81transactions.t @@ -236,7 +236,9 @@ my $fail_code = sub { }; my $err = $@; ok(($err eq ''), 'Pre-connection nested transactions.'); + $schema2->storage->disconnect; } +$schema->storage->disconnect; # Test txn_scope_guard {