Switch most remaining debug-hooks to $dbictest_schema->is_executed_querycount()

[dbsrgits/DBIx-Class.git] / t / prefetch / one_to_many_to_one.t

diff --git a/t/prefetch/one_to_many_to_one.t b/t/prefetch/one_to_many_to_one.t
index f63716e..f79b38e 100644 (file)
--- a/t/prefetch/one_to_many_to_one.t
+++ b/t/prefetch/one_to_many_to_one.t
@@ -12,23 +12,14 @@ my $artist = $schema->resultset ('Artist')->find ({artistid => 1});
 is ($artist->cds->count, 3, 'Correct number of CDs');
 is ($artist->cds->search_related ('genre')->count, 1, 'Only one of the cds has a genre');
 
-my $queries = 0;
-my $orig_cb = $schema->storage->debugcb;
-$schema->storage->debugcb(sub { $queries++ });
-$schema->storage->debug(1);
-
-
-my $pref = $schema->resultset ('Artist')
+$schema->is_executed_querycount( sub {
+  my $pref = $schema->resultset ('Artist')
                      ->search ({ 'me.artistid' => $artist->id }, { prefetch => { cds => 'genre' } })
                       ->next;
 
-is ($pref->cds->count, 3, 'Correct number of CDs prefetched');
-is ($pref->cds->search_related ('genre')->count, 1, 'Only one of the prefetched cds has a prefetched genre');
-
-
-is ($queries, 1, 'All happened within one query only');
-$schema->storage->debugcb($orig_cb);
-$schema->storage->debug(0);
+  is ($pref->cds->count, 3, 'Correct number of CDs prefetched');
+  is ($pref->cds->search_related ('genre')->count, 1, 'Only one of the prefetched cds has a prefetched genre');
 
+}, 1, 'All happened within one query only');
 
 done_testing;