From: Peter Rabbitson Date: Wed, 26 Dec 2012 09:50:33 +0000 (+0100) Subject: Reorganize MSSQL/DBD::Sybase TODOs on MAS+txn tests X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=7fc9679d3181ac6cdd7b7f9c7cdfb4030c928d63;p=dbsrgits%2FDBIx-Class-Historic.git Reorganize MSSQL/DBD::Sybase TODOs on MAS+txn tests --- diff --git a/t/74mssql.t b/t/74mssql.t index 2ec7fa5..243ae0e 100644 --- a/t/74mssql.t +++ b/t/74mssql.t @@ -201,13 +201,14 @@ SQL $rs->delete; } - # test transaction handling on a disconnected handle my $wrappers = { no_transaction => sub { shift->() }, txn_do => sub { my $code = shift; $schema->txn_do(sub { $code->() } ) }, txn_begin => sub { $schema->txn_begin; shift->(); $schema->txn_commit }, txn_guard => sub { my $g = $schema->txn_scope_guard; shift->(); $g->commit }, }; + + # test transaction handling on a disconnected handle for my $wrapper (keys %$wrappers) { $rs->delete; @@ -223,45 +224,40 @@ SQL } "transaction on disconnected handle with $wrapper wrapper"; } - TODO: { + # test transaction handling on a disconnected handle with multiple active + # statements + for my $wrapper (keys %$wrappers) { + $schema->storage->disconnect; + $rs->delete; + $rs->reset; + $rs->create({ amount => 1000 + $_ }) for (1..3); + + my $artist_rs = $schema->resultset('Artist')->search({ + name => { -like => 'Artist %' } + });; + + $rs->next; + + my $map = [ ['Artist 1', '1002.00'], ['Artist 2', '1003.00'] ]; + + weaken(my $a_rs_cp = $artist_rs); + local $TODO = 'Transaction handling with multiple active statements will ' - .'need eager cursor support.'; - - # test transaction handling on a disconnected handle with multiple active - # statements - my $wrappers = { - no_transaction => sub { shift->() }, - txn_do => sub { my $code = shift; $schema->txn_do(sub { $code->() } ) }, - txn_begin => sub { $schema->txn_begin; shift->(); $schema->txn_commit }, - txn_guard => sub { my $g = $schema->txn_scope_guard; shift->(); $g->commit }, - }; - for my $wrapper (keys %$wrappers) { - $rs->reset; - $rs->delete; - $rs->create({ amount => 1000 + $_ }) for (1..3); - - my $artist_rs = $schema->resultset('Artist')->search({ - name => { -like => 'Artist %' } - });; - - $rs->next; - - my $map = [ ['Artist 1', '1002.00'], ['Artist 2', '1003.00'] ]; - - weaken(my $a_rs_cp = $artist_rs); - - lives_and { - my @results; - $wrappers->{$wrapper}->( sub { - while (my $money = $rs_cp->next) { - my $artist = $a_rs_cp->next; - push @results, [ $artist->name, $money->amount ]; - }; - }); - - is_deeply \@results, $map; - } "transactions with multiple active statement with $wrapper wrapper"; - } + .'need eager cursor support.' + unless $wrapper eq 'no_transaction'; + + lives_and { + my @results; + + $wrappers->{$wrapper}->( sub { + while (my $money = $rs_cp->next) { + my $artist = $a_rs_cp->next; + push @results, [ $artist->name, $money->amount ]; + }; + }); + + is_deeply \@results, $map; + } "transactions with multiple active statement with $wrapper wrapper"; } # test RNO detection when version detection fails