Massive rewrite of bind handling, and overall simplification of ::Storage::DBI

[dbsrgits/DBIx-Class.git] / t / search / related_strip_prefetch.t

diff --git a/t/search/related_strip_prefetch.t b/t/search/related_strip_prefetch.t
index 3201a4d..0745baf 100644 (file)
--- a/t/search/related_strip_prefetch.t
+++ b/t/search/related_strip_prefetch.t
@@ -11,23 +11,33 @@ use DBICTest;
 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 2
+      ) 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 ]
+  ],
   'Prefetch spec successfully stripped on search_related'
 );