X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fsearch%2Frelated_strip_prefetch.t;h=76336b1dbba3d29e8fef888bd40ff918de5e6806;hb=130f0abd0ea76114ffdea39a4fea352a35e5e742;hp=3201a4d330c139fd2ace1251c31d63ab5d25904a;hpb=47c1042322712fc11bc709ff701e2292a39aedde;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/search/related_strip_prefetch.t b/t/search/related_strip_prefetch.t
index 3201a4d..76336b1 100644
--- a/t/search/related_strip_prefetch.t
+++ b/t/search/related_strip_prefetch.t
@@ -2,32 +2,45 @@ use strict;
 use warnings;
 
 use Test::More;
-use Test::Exception;
 
 use lib qw(t/lib);
-use DBIC::SqlMakerTest;
 use DBICTest;
+use DBIC::SqlMakerTest;
+use DBIx::Class::SQLMaker::LimitDialects;
+
+my $ROWS = DBIx::Class::SQLMaker::LimitDialects->__rows_bindtype;
 
 my $schema = DBICTest->init_schema();
 
 my $rs = $schema->resultset('CD')->search (
-  { 'tracks.id' => { '!=', 666 }},
-  { join => 'artist', prefetch => 'tracks' }
+  { 'tracks.trackid' => { '!=', 666 }},
+  { join => 'artist', prefetch => 'tracks', rows => 2 }
 );
 
-my $rel_rs = $rs->search_related ('tags');
+my $rel_rs = $rs->search_related ('tags', { 'tags.tag' => { '!=', undef }}, { distinct => 1});
 
 is_same_sql_bind (
   $rel_rs->as_query,
   '(
-    SELECT tags.tagid, tags.cd, tags.tag 
-      FROM cd me
+    SELECT tags.tagid, tags.cd, tags.tag
+      FROM (
+        SELECT me.cdid, me.artist, me.title, me.year, me.genreid, me.single_track
+          FROM cd me
+          JOIN artist artist ON artist.artistid = me.artist
+          LEFT JOIN track tracks ON tracks.cd = me.cdid
+        WHERE ( tracks.trackid != ? )
+        LIMIT ?
+      ) me
       JOIN artist artist ON artist.artistid = me.artist
-      LEFT JOIN track tracks ON tracks.cd = me.cdid
-      LEFT JOIN tags tags ON tags.cd = me.cdid
-    WHERE ( tracks.id != ? )
+      JOIN tags tags ON tags.cd = me.cdid
+    WHERE ( tags.tag IS NOT NULL )
+    GROUP BY tags.tagid, tags.cd, tags.tag
   )',
-  [ [ 'tracks.id' => 666 ] ],
+
+  [
+    [ { sqlt_datatype => 'integer', dbic_colname => 'tracks.trackid' } => 666 ],
+    [ $ROWS => 2 ]
+  ],
   'Prefetch spec successfully stripped on search_related'
 );