From: Rafael Kitover Date: Wed, 5 Aug 2009 18:39:47 +0000 (+0000) Subject: fix up txn_begin and the ping_count test X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=28be49a61823d8e7592ddd9c81e86066fd47e6ee;p=dbsrgits%2FDBIx-Class-Historic.git fix up txn_begin and the ping_count test --- diff --git a/lib/DBIx/Class/Storage/DBI.pm b/lib/DBIx/Class/Storage/DBI.pm index 109802f..094b508 100644 --- a/lib/DBIx/Class/Storage/DBI.pm +++ b/lib/DBIx/Class/Storage/DBI.pm @@ -530,8 +530,15 @@ sub dbh_do { local $self->{_in_dbh_do} = 1; + $self->_do_with_reconnect($code, @_); +} + +sub _do_with_reconnect { + my $self = shift; + my $code = shift; my @result; my $want_array = wantarray; + my $dbh = $self->_dbh; eval { $self->_verify_pid if $dbh; @@ -1056,7 +1063,7 @@ sub txn_begin { # this isn't ->_dbh-> because # we should reconnect on begin_work # for AutoCommit users - $self->dbh_do(sub { $_[1]->begin_work }); + $self->_do_with_reconnect(sub { $_[1]->begin_work }); } elsif ($self->auto_savepoint) { $self->svp_begin; } diff --git a/t/92storage_ping_count.t b/t/92storage_ping_count.t index 4881453..9987283 100644 --- a/t/92storage_ping_count.t +++ b/t/92storage_ping_count.t @@ -9,6 +9,8 @@ use DBICTest; use Data::Dumper; use DBIC::SqlMakerTest; +plan tests => 1; + my $ping_count = 0; my $schema = DBICTest->init_schema(); @@ -25,140 +27,28 @@ my $schema = DBICTest->init_schema(); }; } -my $orig_debug = $schema->storage->debug; - -use IO::File; - -BEGIN { - eval "use DBD::SQLite"; - plan $@ - ? ( skip_all => 'needs DBD::SQLite for testing' ) - : ( tests => 28 ); -} - -my $rs = $schema->resultset("CD")->search( - { 'year' => 2001, 'artist.name' => 'Caterwauler McCrae' }, - { from => [ { 'me' => 'cd' }, - [ - { artist => 'artist' }, - { 'me.artist' => 'artist.artistid' } - ] ] } - ); - -is( $rs + 0, 1, "Single record in resultset"); - -is($rs->first->title, 'Forkful of bees', 'Correct record returned'); - -$rs = $schema->resultset("CD")->search( - { 'year' => 2001, 'artist.name' => 'Caterwauler McCrae' }, - { join => 'artist' }); +# perform some operations and make sure they don't ping -is( $rs + 0, 1, "Single record in resultset"); +$schema->resultset('CD')->create({ + cdid => 6, artist => 3, title => 'mtfnpy', year => 2009 +}); -is($rs->first->title, 'Forkful of bees', 'Correct record returned'); +$schema->resultset('CD')->create({ + cdid => 7, artist => 3, title => 'mtfnpy2', year => 2009 +}); -$rs = $schema->resultset("CD")->search( - { 'artist.name' => 'We Are Goth', - 'liner_notes.notes' => 'Kill Yourself!' }, - { join => [ qw/artist liner_notes/ ] }); +$schema->storage->_dbh->disconnect; -is( $rs + 0, 1, "Single record in resultset"); +$schema->resultset('CD')->create({ + cdid => 8, artist => 3, title => 'mtfnpy3', year => 2009 +}); -is($rs->first->title, 'Come Be Depressed With Us', 'Correct record returned'); +$schema->storage->_dbh->disconnect; -# when using join attribute, make sure slice()ing all objects has same count as all() -$rs = $schema->resultset("CD")->search( - { 'artist' => 1 }, - { join => [qw/artist/], order_by => 'artist.name' } -); -is( scalar $rs->all, scalar $rs->slice(0, $rs->count - 1), 'slice() with join has same count as all()' ); - -ok(!$rs->slice($rs->count+1000, $rs->count+1002)->count, - 'Slicing beyond end of rs returns a zero count'); - -$rs = $schema->resultset("Artist")->search( - { 'liner_notes.notes' => 'Kill Yourself!' }, - { join => { 'cds' => 'liner_notes' } }); - -is( $rs->count, 1, "Single record in resultset"); - -is($rs->first->name, 'We Are Goth', 'Correct record returned'); - - -{ - $schema->populate('Artist', [ - [ qw/artistid name/ ], - [ 4, 'Another Boy Band' ], - ]); - $schema->populate('CD', [ - [ qw/cdid artist title year/ ], - [ 6, 2, "Greatest Hits", 2001 ], - [ 7, 4, "Greatest Hits", 2005 ], - [ 8, 4, "BoyBandBlues", 2008 ], - ]); - $schema->populate('TwoKeys', [ - [ qw/artist cd/ ], - [ 2, 4 ], - [ 2, 6 ], - [ 4, 7 ], - [ 4, 8 ], - ]); - - sub cd_count { - return $schema->resultset("CD")->count; - } - sub tk_count { - return $schema->resultset("TwoKeys")->count; - } - - is(cd_count(), 8, '8 rows in table cd'); - is(tk_count(), 7, '7 rows in table twokeys'); - - sub artist1 { - return $schema->resultset("CD")->search( - { 'artist.name' => 'Caterwauler McCrae' }, - { join => [qw/artist/]} - ); - } - sub artist2 { - return $schema->resultset("CD")->search( - { 'artist.name' => 'Random Boy Band' }, - { join => [qw/artist/]} - ); - } - - is( artist1()->count, 3, '3 Caterwauler McCrae CDs' ); - ok( artist1()->delete, 'Successfully deleted 3 CDs' ); - is( artist1()->count, 0, '0 Caterwauler McCrae CDs' ); - is( artist2()->count, 2, '3 Random Boy Band CDs' ); - ok( artist2()->update( { 'artist' => 1 } ) ); - is( artist2()->count, 0, '0 Random Boy Band CDs' ); - is( artist1()->count, 2, '2 Caterwauler McCrae CDs' ); - - # test update on multi-column-pk - sub tk1 { - return $schema->resultset("TwoKeys")->search( - { - 'artist.name' => { like => '%Boy Band' }, - 'cd.title' => 'Greatest Hits', - }, - { join => [qw/artist cd/] } - ); - } - sub tk2 { - return $schema->resultset("TwoKeys")->search( - { 'artist.name' => 'Caterwauler McCrae' }, - { join => [qw/artist/]} - ); - } - is( tk2()->count, 2, 'TwoKeys count == 2' ); - is( tk1()->count, 2, 'TwoKeys count == 2' ); - ok( tk1()->update( { artist => 1 } ) ); - is( tk1()->count, 0, 'TwoKeys count == 0' ); - is( tk2()->count, 4, '2 Caterwauler McCrae CDs' ); - ok( tk2()->delete, 'Successfully deleted 4 CDs' ); - is(cd_count(), 5, '5 rows in table cd'); - is(tk_count(), 3, '3 rows in table twokeys'); -} +$schema->txn_do(sub { + $schema->resultset('CD')->create({ + cdid => 9, artist => 3, title => 'mtfnpy4', year => 2009 + }); +}); is $ping_count, 0, 'no _ping() calls';