X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fprefetch%2Fvia_search_related.t;h=fbaeeefba620adb0583f534ffa37fd36b7260409;hb=90489c23e598723752c9e0d4b4da214ad05e3feb;hp=f686e15fcbb14aa3c56bbb0ee3b796ffe1676917;hpb=84c690f19e1a31cd39d914f2db0d8ccd7ea9e799;p=dbsrgits%2FDBIx-Class-Historic.git

diff --git a/t/prefetch/via_search_related.t b/t/prefetch/via_search_related.t
index f686e15..fbaeeef 100644
--- a/t/prefetch/via_search_related.t
+++ b/t/prefetch/via_search_related.t
@@ -57,12 +57,12 @@ lives_ok ( sub {
     }
   );
 
-  is($use_prefetch->count, $no_prefetch->count, 'counts with and without prefetch match');
   is(
     scalar ($use_prefetch->all),
     scalar ($no_prefetch->all),
     "Amount of returned rows is right"
   );
+  is($use_prefetch->count, $no_prefetch->count, 'counts with and without prefetch match');
 
 }, 'search_related prefetch with condition referencing unqualified column of a joined table works');
 }
@@ -109,26 +109,30 @@ lives_ok (sub {
     is($rs->search_related('cds')->count, 4, 'prefetch without distinct (count)');
 
 
-    $rs = $artist_rs->search(undef, {distinct => 1})
-                ->search_related('cds')->search_related('genre',
+    $rs = $artist_rs->search_related('cds', {}, { distinct => 1})->search_related('genre',
                     { 'genre.name' => 'vague genre' },
                  );
+    is($rs->all, 2, 'distinct does not propagate over search_related (objects)');
+    is($rs->count, 2, 'distinct does not propagate over search_related (count)');
+
+    $rs = $rs->search ({}, { distinct => 1} );
     is($rs->all, 1, 'distinct without prefetch (objects)');
     is($rs->count, 1, 'distinct without prefetch (count)');
 
 
-    $rs = $artist_rs->search({}, {distinct => 1})
-                ->search_related('cds')->search_related('genre',
+    $rs = $artist_rs->search_related('cds')->search_related('genre',
                     { 'genre.name' => 'vague genre' },
-                    { prefetch => 'cds' },
+                    { prefetch => 'cds', distinct => 1 },
                  );
     is($rs->all, 1, 'distinct with prefetch (objects)');
     is($rs->count, 1, 'distinct with prefetch (count)');
+
+  TODO: {
+    local $TODO = "This makes another 2 trips to the database, it can't be right";
     # 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)');
-
-
+  }
 
 }, 'distinct generally works with prefetch on deep search_related chains');