X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fprefetch%2Fwith_limit.t;h=1d2aa84ff5dc2aeb905269374bb1861b70c992a3;hb=946f626022c63fd269d9d985c2abeabb52871027;hp=f6729b176d8f56191fb4f9fd25b671bf1a56200a;hpb=36fd7f073078f8f36277b467910ab68676361edf;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/prefetch/with_limit.t b/t/prefetch/with_limit.t
index f6729b1..1d2aa84 100644
--- a/t/prefetch/with_limit.t
+++ b/t/prefetch/with_limit.t
@@ -8,6 +8,9 @@ use Test::Exception;
 use lib qw(t/lib);
 use DBICTest;
 use DBIC::SqlMakerTest;
+use DBIx::Class::SQLMaker::LimitDialects;
+
+my $ROWS = DBIx::Class::SQLMaker::LimitDialects->__rows_bindtype;
 
 my $schema = DBICTest->init_schema();
 
@@ -31,7 +34,7 @@ my $use_prefetch = $no_prefetch->search(
   }
 );
 
-# add a floating +select to make sure it does nto throw things off
+# add an extra +select to make sure it does not throw things off
 # we also expect it to appear in both selectors, as we can not know
 # for sure which part of the query it applies to (may be order_by,
 # maybe something else)
@@ -39,20 +42,24 @@ my $use_prefetch = $no_prefetch->search(
 # we use a reference to the same array in bind vals, because
 # is_deeply picks up this difference too (not sure if bug or
 # feature)
-my $bind_one = [ __add => 1 ];
 $use_prefetch = $use_prefetch->search({}, {
-  '+select' => \[ 'me.artistid + ?', $bind_one ],
+  '+columns' => { monkeywrench => \[ 'me.artistid + ?', [ \ 'inTEger' => 1 ] ] },
 });
 
+my $bind_int_resolved = sub { [ { sqlt_datatype => 'inTEger' } => 1 ] };
+my $bind_vc_resolved = sub { [
+  { sqlt_datatype => 'varchar', sqlt_size => 100, dbic_colname => 'tracks.title' }
+    => 'blah-blah-1234568'
+] };
 is_same_sql_bind (
   $use_prefetch->as_query,
   '(
-    SELECT  me.artistid, me.name,
-            cds.cdid, cds.artist, cds.title, cds.year, cds.genreid, cds.single_track,
-            me.artistid + ?
+    SELECT  me.artistid + ?,
+            me.artistid, me.name,
+            cds.cdid, cds.artist, cds.title, cds.year, cds.genreid, cds.single_track
       FROM (
-        SELECT me.artistid, me.name,
-               me.artistid + ?
+        SELECT me.artistid + ?,
+               me.artistid, me.name
           FROM artist me
           LEFT JOIN cd cds
             ON cds.artist = me.artistid
@@ -62,8 +69,8 @@ is_same_sql_bind (
             ON tracks.cd = cds.cdid
         WHERE   artwork.cd_id IS NULL
              OR tracks.title != ?
-        GROUP BY me.artistid, me.name, me.artistid + ?
-        ORDER BY name DESC LIMIT 3
+        GROUP BY me.artistid + ?, me.artistid, me.name
+        ORDER BY name DESC LIMIT ?
       ) me
       LEFT JOIN cd cds
         ON cds.artist = me.artistid
@@ -73,16 +80,17 @@ is_same_sql_bind (
         ON tracks.cd = cds.cdid
     WHERE artwork.cd_id IS NULL
        OR tracks.title != ?
-    GROUP BY me.artistid, me.name, cds.cdid, cds.artist, cds.title, cds.year, cds.genreid, cds.single_track, me.artistid + ?
-    ORDER BY name DESC, cds.artist, cds.year ASC
+    GROUP BY me.artistid + ?, me.artistid, me.name, cds.cdid, cds.artist, cds.title, cds.year, cds.genreid, cds.single_track
+    ORDER BY name DESC
   )',
   [
-    $bind_one,  # outer select
-    $bind_one,  # inner select
-    [ 'tracks.title' => 'blah-blah-1234568' ], # inner where
-    $bind_one,  # inner group_by
-    [ 'tracks.title' => 'blah-blah-1234568' ], # outer where
-    $bind_one,  # outer group_by
+    $bind_int_resolved->(),  # outer select
+    $bind_int_resolved->(),  # inner select
+    $bind_vc_resolved->(), # inner where
+    $bind_int_resolved->(),  # inner group_by
+    [ $ROWS => 3 ],
+    $bind_vc_resolved->(), # outer where
+    $bind_int_resolved->(),  # outer group_by
   ],
   'Expected SQL on complex limited prefetch'
 );
@@ -175,20 +183,21 @@ is_same_sql_bind (
           FROM cd me
           JOIN artist artist ON artist.artistid = me.artist
         WHERE ( ( artist.name = ? AND me.year = ? ) )
-        LIMIT 15
+        LIMIT ?
       ) me
       LEFT JOIN track tracks
         ON tracks.cd = me.cdid
       JOIN artist artist
         ON artist.artistid = me.artist
     WHERE ( ( artist.name = ? AND me.year = ? ) )
-    ORDER BY tracks.cd
+    ORDER BY me.cdid
   )',
   [
-    [ 'artist.name' => 'foo' ],
-    [ 'me.year'     => 2010  ],
-    [ 'artist.name' => 'foo' ],
-    [ 'me.year'     => 2010  ],
+    [ { sqlt_datatype => 'varchar', sqlt_size => 100, dbic_colname => 'artist.name' } => 'foo' ],
+    [ { sqlt_datatype => 'varchar', sqlt_size => 100, dbic_colname => 'me.year' } => 2010 ],
+    [ $ROWS         => 15    ],
+    [ { sqlt_datatype => 'varchar', sqlt_size => 100, dbic_colname => 'artist.name' } => 'foo' ],
+    [ { sqlt_datatype => 'varchar', sqlt_size => 100, dbic_colname => 'me.year' } => 2010 ],
   ],
   'No grouping of non-multiplying resultsets',
 );