my $schema = DBICTest->init_schema();
-plan tests => 67;
+plan tests => 64;
my $code = sub {
my ($artist, @cd_titles) = @_;
$schema2->txn_begin();
};
my $err = $@;
- ok(($err eq ''), 'Pre-connection nested transactions.');
-}
-
-# Test txn_rollback with nested
-{
- local $TODO = "Work out how this should work";
- my $local_schema = DBICTest->init_schema();
+ ok(! $err, 'Pre-connection nested transactions.');
- my $artist_rs = $local_schema->resultset('Artist');
- throws_ok {
-
- $local_schema->txn_begin;
- $artist_rs->create({ name => 'Test artist rollback 1'});
- $local_schema->txn_begin;
- is($local_schema->storage->transaction_depth, 2, "Correct transaction depth");
- $artist_rs->create({ name => 'Test artist rollback 2'});
- $local_schema->txn_rollback;
- } qr/Not sure what this should be.... something tho/, "Rolled back okay";
- is($local_schema->storage->transaction_depth, 0, "Correct transaction depth");
-
- ok(!$artist_rs->find({ name => 'Test artist rollback 1'}), "Test Artist not created")
- || $artist_rs->find({ name => 'Test artist rollback 1'})->delete;
+ # although not connected DBI would still warn about rolling back at disconnect
+ $schema2->txn_rollback;
+ $schema2->txn_rollback;
+ $schema2->storage->disconnect;
}
+$schema->storage->disconnect;
# Test txn_scope_guard
{
- local $TODO = "Work out how this should work";
my $schema = DBICTest->init_schema();
is($schema->storage->transaction_depth, 0, "Correct transaction depth");
});
$guard->commit;
- } qr/No such column made_up_column.*?line 16/, "Error propogated okay";
+ } qr/No such column made_up_column .*? at .*?81transactions.t line \d+/s, "Error propogated okay";
ok(!$artist_rs->find({name => 'Death Cab for Cutie'}), "Artist not created");
ok(!$artist_rs->find({name => 'Death Cab for Cutie'}), "Artist not created");
+ lives_ok (sub {
+ my $w;
+ local $SIG{__WARN__} = sub { $w = shift };
- eval {
- # The 0 arg says done die, just let the scope guard go out of scope
+ # The 0 arg says don't die, just let the scope guard go out of scope
# forcing a txn_rollback to happen
outer($schema, 0);
- };
- is($@, "Not sure what we want here, but something", "Rollback okay");
- ok(!$artist_rs->find({name => 'Death Cab for Cutie'}), "Artist not created");
+ like ($w, qr/A DBIx::Class::Storage::TxnScopeGuard went out of scope without explicit commit or an error/, 'Out of scope warning detected');
+ ok(!$artist_rs->find({name => 'Death Cab for Cutie'}), "Artist not created");
+ }, 'rollback successful withot exception');
sub outer {
my ($schema) = @_;
-
+
my $guard = $schema->txn_scope_guard;
$schema->resultset('Artist')->create({
name => 'Death Cab for Cutie',
});
inner(@_);
- $guard->commit;
}
sub inner {
my ($schema, $fatal) = @_;
- my $guard = $schema->txn_scope_guard;
+
+ my $inner_guard = $schema->txn_scope_guard;
+ is($schema->storage->transaction_depth, 2, "Correct transaction depth");
my $artist = $artist_rs->find({ name => 'Death Cab for Cutie' });
- is($schema->storage->transaction_depth, 2, "Correct transaction depth");
- undef $@;
eval {
$artist->cds->create({
title => 'Plans',
die $@;
}
- # See what happens if we dont $guard->commit;
+ # inner guard should commit without consequences
+ $inner_guard->commit;
}
}