nuke DBI->trace calls

diff --git a/t/run/16joins.tl b/t/run/16joins.tl
index 49ecbcf..c83aa7c 100644 (file)
--- a/t/run/16joins.tl
+++ b/t/run/16joins.tl
@@ -116,9 +116,11 @@ $rs = $schema->resultset("CD")->search(
 
 cmp_ok($rs + 0, '==', 3, 'Correct number of records returned');
 
-# start test for prefetch SELECT count
-unlink 't/var/dbic.trace' if -e 't/var/dbic.trace';
-DBI->trace(1, 't/var/dbic.trace');
+my $queries = 0;
+$schema->storage->debugcb(sub { $queries++ });
+
+$queries = 0;
+$schema->storage->debug(1);
 
 my @cd = $rs->all;
 
@@ -132,17 +134,9 @@ is(ref $cd[1]->liner_notes, 'DBICTest::LinerNotes', 'Prefetch returns correct cl
 
 is($cd[2]->{_inflated_column}{artist}->name, 'Caterwauler McCrae', 'Prefetch on parent object ok');
 
-# count the SELECTs
-DBI->trace(0, undef);
-my $selects = 0;
-my $trace = IO::File->new('t/var/dbic.trace', '<') 
-    or die "Unable to read trace file";
-while (<$trace>) {
-    $selects++ if /SELECT/;
-}
-$trace->close;
-unlink 't/var/dbic.trace';
-is($selects, 1, 'prefetch ran only 1 select statement');
+is($queries, 1, 'prefetch ran only 1 select statement');
+
+$schema->storage->debug(0);
 
 # test for partial prefetch via columns attr
 my $cd = $schema->resultset('CD')->find(1,
@@ -154,8 +148,8 @@ my $cd = $schema->resultset('CD')->find(1,
 ok(eval { $cd->artist->name eq 'Caterwauler McCrae' }, 'single related column prefetched');
 
 # start test for nested prefetch SELECT count
-unlink 't/var/dbic.trace' if -e 't/var/dbic.trace';
-DBI->trace(1, 't/var/dbic.trace');
+$queries = 0;
+$schema->storage->debug(1);
 
 $rs = $schema->resultset('Tag')->search(
   {},
@@ -171,36 +165,18 @@ is( $tag->cd->title, 'Spoonful of bees', 'step 1 ok for nested prefetch' );
 is( $tag->cd->artist->name, 'Caterwauler McCrae', 'step 2 ok for nested prefetch');
 
 # count the SELECTs
-DBI->trace(0, undef);
-$selects = 0;
-$trace = IO::File->new('t/var/dbic.trace', '<') 
-    or die "Unable to read trace file";
-while (<$trace>) {
-    $selects++ if /SELECT(?!.*WHERE 1=0.*)/;
-}
-$trace->close;
-unlink 't/var/dbic.trace';
-is($selects, 1, 'nested prefetch ran exactly 1 select statement (excluding column_info)');
+#$selects++ if /SELECT(?!.*WHERE 1=0.*)/;
+is($queries, 1, 'nested prefetch ran exactly 1 select statement (excluding column_info)');
 
-# start test for prefetch on find SELECT count
-unlink 't/var/dbic.trace' if -e 't/var/dbic.trace';
-DBI->trace(1, 't/var/dbic.trace');
+$queries = 0;
 
 $cd = $schema->resultset('CD')->find(1, { prefetch => 'artist' });
 
 is($cd->{_inflated_column}{artist}->name, 'Caterwauler McCrae', 'artist prefetched correctly on find');
 
-# count the SELECTs
-DBI->trace(0, undef);
-$selects = 0;
-$trace = IO::File->new('t/var/dbic.trace', '<') 
-    or die "Unable to read trace file";
-while (<$trace>) {
-    $selects++ if /SELECT(?!.*WHERE 1=0.*)/;
-}
-$trace->close;
-unlink 't/var/dbic.trace';
-is($selects, 1, 'find with prefetch ran exactly 1 select statement (excluding column_info)');
+is($queries, 1, 'find with prefetch ran exactly 1 select statement (excluding column_info)');
+
+$schema->storage->debug(0);
 
 $rs = $schema->resultset('Tag')->search(
   {},
@@ -277,8 +253,7 @@ SKIP: {
 
 is($rs->next->name, 'Caterwauler McCrae', "Correct artist returned");
 
-my $queries;
-$schema->storage->debugcb(sub { $queries++ });
+$queries = 0;
 $schema->storage->debug(1);
 
 my $tree_like =

diff --git a/t/run/23cache.tl b/t/run/23cache.tl
index 4be8fbd..74a6ae9 100644 (file)
--- a/t/run/23cache.tl
+++ b/t/run/23cache.tl
@@ -1,6 +1,9 @@
 sub run_tests {
 my $schema = shift;
 
+my $queries;
+$schema->storage->debugcb( sub{ $queries++ } );
+
 eval "use DBD::SQLite";
 plan skip_all => 'needs DBD::SQLite for testing' if $@;
 plan tests => 23;
@@ -41,25 +44,16 @@ eval {
 
 is( scalar @{$rs->get_cache}, 0, 'set_cache() only accepts objects of correct type for the resultset' );
 
-unlink 't/var/dbic.trace' if -e 't/var/dbic.trace';
-DBI->trace(1, 't/var/dbic.trace');
+$queries = 0;
+$schema->storage->debug(1);
 
 $rs = $schema->resultset('Artist')->search( undef, { cache => 1 } );
 while( $artist = $rs->next ) {}
 $artist = $rs->first();
 
-# count the SELECTs
-DBI->trace(0, undef);
-my $selects = 0;
-$trace = IO::File->new('t/var/dbic.trace', '<') 
-    or die "Unable to read trace file";
-while (<$trace>) {
-    $selects++ if /SELECT/;
-}
-$trace->close;
-unlink 't/var/dbic.trace';
+is( $queries, 1, 'revisiting a row does not issue a query when cache => 1' );
 
-is( $selects, 1, 'revisiting a row does not issue a query when cache => 1' );
+$schema->storage->debug(0);
 
 my @a = $schema->resultset("Artist")->search(
   { },
@@ -82,8 +76,8 @@ $rs = $schema->resultset("Artist")->search(
 use Data::Dumper; $Data::Dumper::Deparse = 1;
 
 # start test for prefetch SELECT count
-unlink 't/var/dbic.trace' if -e 't/var/dbic.trace';
-DBI->trace(1, 't/var/dbic.trace');
+$queries = 0;
+$schema->storage->debug(1);
 
 $artist = $rs->first;
 $rs->reset();
@@ -103,17 +97,9 @@ is( $artist->cds->count, 3, 'artist->cds->count returns correct value' );
 # ensure that $artist->count_related('cds') returns correct value
 is( $artist->count_related('cds'), 3, 'artist->count_related returns correct value' );
 
-# count the SELECTs
-DBI->trace(0, undef);
-$selects = 0;
-my $trace = IO::File->new('t/var/dbic.trace', '<') 
-    or die "Unable to read trace file";
-while (<$trace>) {
-    $selects++ if /SELECT/;
-}
-$trace->close;
-unlink 't/var/dbic.trace';
-is($selects, 1, 'only one SQL statement executed');
+is($queries, 1, 'only one SQL statement executed');
+
+$schema->storage->debug(0);
 
 # make sure related_resultset is deleted after object is updated
 $artist->set_column('name', 'New Name');
@@ -143,28 +129,20 @@ is($artist->cds, 0, 'No cds for this artist');
 }
 
 # SELECT count for nested has_many prefetch
-unlink 't/var/dbic.trace' if -e 't/var/dbic.trace';
-DBI->trace(1, 't/var/dbic.trace');
+$queries = 0;
+$schema->storage->debug(1);
 
 $artist = ($rs->all)[0];
 
-# count the SELECTs
-DBI->trace(0, undef);
-$selects = 0;
-$trace = IO::File->new('t/var/dbic.trace', '<') 
-    or die "Unable to read trace file";
-while (<$trace>) {
-    $selects++ if /SELECT/;
-}
-$trace->close;
-unlink 't/var/dbic.trace';
-is($selects, 1, 'only one SQL statement executed');
+is($queries, 1, 'only one SQL statement executed');
+
+$schema->storage->debug(0);
 
 my @objs;
 #$artist = $rs->find(1);
 
-unlink 't/var/dbic.trace' if -e 't/var/dbic.trace';
-DBI->trace(1, 't/var/dbic.trace');
+$queries = 0;
+$schema->storage->debug(1);
 
 my $cds = $artist->cds;
 my $tags = $cds->next->tags;
@@ -182,57 +160,24 @@ while( my $tag = $tags->next ) {
 
 is_deeply( \@objs, [ 2, 5, 8 ], 'second cd has correct tags' );
 
-# count the SELECTs
-DBI->trace(0, undef);
-$selects = 0;
-$trace = IO::File->new('t/var/dbic.trace', '<') 
-    or die "Unable to read trace file";
-while (<$trace>) {
-    $selects++ if /SELECT/;
-}
-$trace->close;
-unlink 't/var/dbic.trace';
-
-is( $selects, 0, 'no additional SQL statements while checking nested data' );
+is( $queries, 0, 'no additional SQL statements while checking nested data' );
 
 # start test for prefetch SELECT count
-unlink 't/var/dbic.trace' if -e 't/var/dbic.trace';
-DBI->trace(1, 't/var/dbic.trace');
+$queries = 0;
 
 $artist = $schema->resultset('Artist')->find(1, { prefetch => [qw/cds/] });
 
-# count the SELECTs
-DBI->trace(0, undef);
-$selects = 0;
-$trace = IO::File->new('t/var/dbic.trace', '<') 
-    or die "Unable to read trace file";
-while (<$trace>) {
-    $selects++ if /SELECT/;
-}
-$trace->close;
-unlink 't/var/dbic.trace';
-
-is( $selects, 1, 'only one select statement on find with inline has_many prefetch' );
+is( $queries, 1, 'only one select statement on find with inline has_many prefetch' );
 
 # start test for prefetch SELECT count
-unlink 't/var/dbic.trace' if -e 't/var/dbic.trace';
-DBI->trace(1, 't/var/dbic.trace');
+$queries = 0;
 
 $rs = $schema->resultset('Artist')->search(undef, { prefetch => [qw/cds/] });
 $artist = $rs->find(1);
 
-# count the SELECTs
-DBI->trace(0, undef);
-$selects = 0;
-$trace = IO::File->new('t/var/dbic.trace', '<') 
-    or die "Unable to read trace file";
-while (<$trace>) {
-    $selects++ if /SELECT/;
-}
-$trace->close;
-unlink 't/var/dbic.trace';
+is( $queries, 1, 'only one select statement on find with has_many prefetch on resultset' );
 
-is( $selects, 1, 'only one select statement on find with has_many prefetch on resultset' );
+$schema->storage->debug(0);
 
 }