X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fprefetch%2Fvia_search_related.t;h=316035d4bfa4f1eb23460f39ec59fdbe29becc22;hb=df54756ae88f99969e1576f028324ef94fdb67da;hp=d838ad18badea89ad4106db18d1985f1a42c0b4b;hpb=9fd5c112aed0aa0734266ccbc2b66a3e37d62ce2;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/prefetch/via_search_related.t b/t/prefetch/via_search_related.t
index d838ad1..316035d 100644
--- a/t/prefetch/via_search_related.t
+++ b/t/prefetch/via_search_related.t
@@ -9,10 +9,6 @@ use DBICTest;
 
 my $schema = DBICTest->init_schema();
 
-my $queries;
-my $debugcb = sub { $queries++; };
-my $orig_debug = $schema->storage->debug;
-
 lives_ok ( sub {
   my $no_prefetch = $schema->resultset('Track')->search_related(cd =>
     {
@@ -69,6 +65,39 @@ lives_ok ( sub {
 
 }, 'search_related prefetch with condition referencing unqualified column of a joined table works');
 
+# make sure chains off prefetched results still work
+{
+  my $cd = $schema->resultset('CD')->search({}, { prefetch => 'cd_to_producer' })->find(1);
+
+  $schema->is_executed_querycount( sub {
+      is( $cd->cd_to_producer->count, 3 ,'Count of prefetched m2m links via accessor' );
+    is( scalar $cd->cd_to_producer->all, 3, 'Amount of prefetched m2m link objects via accessor' );
+    is( $cd->search_related('cd_to_producer')->count, 3, 'Count of prefetched m2m links via search_related' );
+    is( scalar $cd->search_related('cd_to_producer')->all, 3, 'Amount of prefetched m2m links via search_related' );
+  }, 0, 'No queries ran so far');
+
+  is( scalar $cd->cd_to_producer->search_related('producer')->all, 3,
+      'Amount of objects via search_related off prefetched linker' );
+  is( $cd->cd_to_producer->search_related('producer')->count, 3,
+      'Count via search_related off prefetched linker' );
+  is( scalar $cd->search_related('cd_to_producer')->search_related('producer')->all, 3,
+      'Amount of objects via chained search_related off prefetched linker' );
+  is( $cd->search_related('cd_to_producer')->search_related('producer')->count, 3,
+      'Count via chained search_related off prefetched linker' );
+  is( scalar $cd->producers->all, 3,
+      'Amount of objects via m2m accessor' );
+  is( $cd->producers->count, 3,
+      'Count via m2m accessor' );
+
+  $schema->is_executed_querycount( sub {
+    is( $cd->cd_to_producer->count, 3 ,'Review count of prefetched m2m links via accessor' );
+    is( scalar $cd->cd_to_producer->all, 3, 'Review amount of prefetched m2m link objects via accessor' );
+    is( $cd->search_related('cd_to_producer')->count, 3, 'Review count of prefetched m2m links via search_related' );
+    is( scalar $cd->search_related('cd_to_producer')->all, 3, 'Rreview amount of prefetched m2m links via search_related' );
+  }, 0, 'Still no queries on prefetched linker');
+}
+
+# tests with distinct => 1
 lives_ok (sub {
     my $rs = $schema->resultset("Artwork")->search(undef, {distinct => 1})
               ->search_related('artwork_to_artist')->search_related('artist',
@@ -128,22 +157,44 @@ lives_ok (sub {
     is($rs->all, 1, 'distinct with prefetch (objects)');
     is($rs->count, 1, 'distinct with prefetch (count)');
 
-  TODO: {
-    $queries = 0;
-    $schema->storage->debugcb ($debugcb);
-    $schema->storage->debug (1);
+    local $TODO = "This makes another 2 trips to the database, it can't be right";
+    $schema->is_executed_querycount( sub {
 
-    # artist -> 2 cds -> 2 genres -> 2 cds for each genre + distinct = 2
-    is($rs->search_related('cds')->all, 2, 'prefetched distinct with prefetch (objects)');
-    is($rs->search_related('cds')->count, 2, 'prefetched distinct with prefetch (count)');
+      # the is() calls are not todoified
+      local $TODO;
 
-    local $TODO = "This makes another 2 trips to the database, it can't be right";
-    is ($queries, 0, 'No extra queries fired (prefetch survives search_related)');
+      # artist -> 2 cds -> 2 genres -> 2 cds for each genre + distinct = 2
+      is($rs->search_related('cds')->all, 2, 'prefetched distinct with prefetch (objects)');
+      is($rs->search_related('cds')->count, 2, 'prefetched distinct with prefetch (count)');
 
-    $schema->storage->debugcb (undef);
-    $schema->storage->debug ($orig_debug);
-  }
+    }, 0, 'No extra queries fired (prefetch survives search_related)');
 
 }, 'distinct generally works with prefetch on deep search_related chains');
 
+# pathological "user knows what they're doing" case
+# lifted from production somewhere
+{
+  $schema->resultset('CD')
+   ->search({ cdid => [1,2] })
+    ->search_related('tracks', { position => [3,1] })
+     ->delete_all;
+
+  my $rs = $schema->resultset('CD')->search_related('tracks', {}, {
+    group_by => 'me.title',
+    columns => { title => 'me.title', max_trk => \ 'MAX(tracks.position)' },
+  });
+
+  is_deeply(
+    $rs->search({}, { order_by => 'me.title' })->all_hri,
+    [
+      { title => "Caterwaulin' Blues", max_trk => 3 },
+      { title => "Come Be Depressed With Us", max_trk => 3 },
+      { title => "Forkful of bees", max_trk => 1 },
+      { title => "Generic Manufactured Singles", max_trk => 3 },
+      { title => "Spoonful of bees", max_trk => 1 },
+    ],
+    'Expected nonsense',
+  );
+}
+
 done_testing;