X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fsqlmaker%2Flimit_dialects%2Ffetch_first.t;h=ab3e17034cc3dad0051d9384b82195387b3442b7;hb=7db287353abcf82c4fe856d4636384084ed5c13f;hp=7a282e907a45ba9f97a4dd80ad1bea6cfffa366d;hpb=86bb5a27dac3255f4fadf5bef120edda9e17bc73;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/sqlmaker/limit_dialects/fetch_first.t b/t/sqlmaker/limit_dialects/fetch_first.t
index 7a282e9..ab3e170 100644
--- a/t/sqlmaker/limit_dialects/fetch_first.t
+++ b/t/sqlmaker/limit_dialects/fetch_first.t
@@ -3,8 +3,7 @@ use warnings;
 
 use Test::More;
 use lib qw(t/lib);
-use DBICTest;
-use DBIC::SqlMakerTest;
+use DBICTest ':DiffSQL';
 
 my $schema = DBICTest->init_schema;
 
@@ -27,7 +26,7 @@ for my $null_order (
   my $rs = $books_45_and_owners->search ({}, {order_by => $null_order });
   is_same_sql_bind(
       $rs->as_query,
-      '(SELECT id, source, owner, price, owner__id, owner__name
+      '(SELECT me.id, me.source, me.owner, me.price, owner__id, owner__name
           FROM (
             SELECT me.id, me.source, me.owner, me.price, owner.id AS owner__id, owner.name AS owner__name
               FROM books me
@@ -49,58 +48,58 @@ for my $ord_set (
   {
     order_by => \'title DESC',
     order_inner => 'title DESC',
-    order_outer => 'ORDER__BY__1 ASC',
-    order_req => 'ORDER__BY__1 DESC',
-    exselect_outer => 'ORDER__BY__1',
-    exselect_inner => 'title AS ORDER__BY__1',
+    order_outer => 'ORDER__BY__001 ASC',
+    order_req => 'ORDER__BY__001 DESC',
+    exselect_outer => 'ORDER__BY__001',
+    exselect_inner => 'title AS ORDER__BY__001',
   },
   {
     order_by => { -asc => 'title'  },
     order_inner => 'title ASC',
-    order_outer => 'ORDER__BY__1 DESC',
-    order_req => 'ORDER__BY__1 ASC',
-    exselect_outer => 'ORDER__BY__1',
-    exselect_inner => 'title AS ORDER__BY__1',
+    order_outer => 'ORDER__BY__001 DESC',
+    order_req => 'ORDER__BY__001 ASC',
+    exselect_outer => 'ORDER__BY__001',
+    exselect_inner => 'title AS ORDER__BY__001',
   },
   {
     order_by => { -desc => 'title' },
     order_inner => 'title DESC',
-    order_outer => 'ORDER__BY__1 ASC',
-    order_req => 'ORDER__BY__1 DESC',
-    exselect_outer => 'ORDER__BY__1',
-    exselect_inner => 'title AS ORDER__BY__1',
+    order_outer => 'ORDER__BY__001 ASC',
+    order_req => 'ORDER__BY__001 DESC',
+    exselect_outer => 'ORDER__BY__001',
+    exselect_inner => 'title AS ORDER__BY__001',
   },
   {
     order_by => 'title',
     order_inner => 'title',
-    order_outer => 'ORDER__BY__1 DESC',
-    order_req => 'ORDER__BY__1',
-    exselect_outer => 'ORDER__BY__1',
-    exselect_inner => 'title AS ORDER__BY__1',
+    order_outer => 'ORDER__BY__001 DESC',
+    order_req => 'ORDER__BY__001',
+    exselect_outer => 'ORDER__BY__001',
+    exselect_inner => 'title AS ORDER__BY__001',
   },
   {
     order_by => [ qw{ title me.owner}   ],
     order_inner => 'title, me.owner',
-    order_outer => 'ORDER__BY__1 DESC, me.owner DESC',
-    order_req => 'ORDER__BY__1, me.owner',
-    exselect_outer => 'ORDER__BY__1',
-    exselect_inner => 'title AS ORDER__BY__1',
+    order_outer => 'ORDER__BY__001 DESC, me.owner DESC',
+    order_req => 'ORDER__BY__001, me.owner',
+    exselect_outer => 'ORDER__BY__001',
+    exselect_inner => 'title AS ORDER__BY__001',
   },
   {
     order_by => ['title', { -desc => 'bar' } ],
     order_inner => 'title, bar DESC',
-    order_outer => 'ORDER__BY__1 DESC, ORDER__BY__2 ASC',
-    order_req => 'ORDER__BY__1, ORDER__BY__2 DESC',
-    exselect_outer => 'ORDER__BY__1, ORDER__BY__2',
-    exselect_inner => 'title AS ORDER__BY__1, bar AS ORDER__BY__2',
+    order_outer => 'ORDER__BY__001 DESC, ORDER__BY__002 ASC',
+    order_req => 'ORDER__BY__001, ORDER__BY__002 DESC',
+    exselect_outer => 'ORDER__BY__001, ORDER__BY__002',
+    exselect_inner => 'title AS ORDER__BY__001, bar AS ORDER__BY__002',
   },
   {
     order_by => { -asc => [qw{ title bar }] },
     order_inner => 'title ASC, bar ASC',
-    order_outer => 'ORDER__BY__1 DESC, ORDER__BY__2 DESC',
-    order_req => 'ORDER__BY__1 ASC, ORDER__BY__2 ASC',
-    exselect_outer => 'ORDER__BY__1, ORDER__BY__2',
-    exselect_inner => 'title AS ORDER__BY__1, bar AS ORDER__BY__2',
+    order_outer => 'ORDER__BY__001 DESC, ORDER__BY__002 DESC',
+    order_req => 'ORDER__BY__001 ASC, ORDER__BY__002 ASC',
+    exselect_outer => 'ORDER__BY__001, ORDER__BY__002',
+    exselect_inner => 'title AS ORDER__BY__001, bar AS ORDER__BY__002',
   },
   {
     order_by => [
@@ -109,10 +108,19 @@ for my $ord_set (
       { -asc  => [qw{me.owner sensors}]},
     ],
     order_inner => 'title, bar DESC, me.owner ASC, sensors ASC',
-    order_outer => 'ORDER__BY__1 DESC, ORDER__BY__2 ASC, me.owner DESC, ORDER__BY__3 DESC',
-    order_req => 'ORDER__BY__1, ORDER__BY__2 DESC, me.owner ASC, ORDER__BY__3 ASC',
-    exselect_outer => 'ORDER__BY__1, ORDER__BY__2, ORDER__BY__3',
-    exselect_inner => 'title AS ORDER__BY__1, bar AS ORDER__BY__2, sensors AS ORDER__BY__3',
+    order_outer => 'ORDER__BY__001 DESC, ORDER__BY__002 ASC, me.owner DESC, ORDER__BY__003 DESC',
+    order_req => 'ORDER__BY__001, ORDER__BY__002 DESC, me.owner ASC, ORDER__BY__003 ASC',
+    exselect_outer => 'ORDER__BY__001, ORDER__BY__002, ORDER__BY__003',
+    exselect_inner => 'title AS ORDER__BY__001, bar AS ORDER__BY__002, sensors AS ORDER__BY__003',
+  },
+
+  {
+    order_by => [
+      'name',
+    ],
+    order_inner => 'name',
+    order_outer => 'name DESC',
+    order_req => 'name',
   },
 ) {
   my $o_sel = $ord_set->{exselect_outer}
@@ -124,11 +132,16 @@ for my $ord_set (
     : ''
   ;
 
+  my $rs = $books_45_and_owners->search ({}, {order_by => $ord_set->{order_by}});
+
+  # query actually works
+  ok( defined $rs->count, 'Query actually works' );
+
   is_same_sql_bind(
-    $books_45_and_owners->search ({}, {order_by => $ord_set->{order_by}})->as_query,
-    "(SELECT id, source, owner, price, owner__id, owner__name
+    $rs->as_query,
+    "(SELECT me.id, me.source, me.owner, me.price, owner__id, owner__name
         FROM (
-          SELECT id, source, owner, price, owner__id, owner__name$o_sel
+          SELECT me.id, me.source, me.owner, me.price, owner__id, owner__name$o_sel
             FROM (
               SELECT me.id, me.source, me.owner, me.price, owner.id AS owner__id, owner.name AS owner__name$i_sel
                 FROM books me
@@ -141,11 +154,11 @@ for my $ord_set (
           FETCH FIRST 2 ROWS ONLY
         ) me
       ORDER BY $ord_set->{order_req}
-      FETCH FIRST 2 ROWS ONLY
     )",
     [ [ { sqlt_datatype => 'varchar', sqlt_size => 100, dbic_colname => 'source' }
         => 'Library' ] ],
   );
+
 }
 
 # with groupby
@@ -153,11 +166,11 @@ is_same_sql_bind (
   $books_45_and_owners->search ({}, { group_by => 'title', order_by => 'title' })->as_query,
   '(SELECT me.id, me.source, me.owner, me.price, owner.id, owner.name
       FROM (
-        SELECT id, source, owner, price, ORDER__BY__1 AS title
+        SELECT me.id, me.source, me.owner, me.price, me.title
           FROM (
-            SELECT id, source, owner, price, ORDER__BY__1
+            SELECT me.id, me.source, me.owner, me.price, me.title
               FROM (
-                SELECT me.id, me.source, me.owner, me.price, title AS ORDER__BY__1
+                SELECT me.id, me.source, me.owner, me.price, me.title
                   FROM books me
                   JOIN owners owner ON owner.id = me.owner
                 WHERE ( source = ? )
@@ -165,11 +178,10 @@ is_same_sql_bind (
                 ORDER BY title
                 FETCH FIRST 5 ROWS ONLY
               ) me
-            ORDER BY ORDER__BY__1 DESC
+            ORDER BY title DESC
             FETCH FIRST 2 ROWS ONLY
           ) me
-        ORDER BY ORDER__BY__1
-        FETCH FIRST 2 ROWS ONLY
+        ORDER BY title
       ) me
       JOIN owners owner ON owner.id = me.owner
     WHERE ( source = ? )
@@ -191,12 +203,10 @@ my $rs_selectas_top = $schema->resultset ('BooksInLibrary')->search ({}, {
 
 is_same_sql_bind( $rs_selectas_top->search({})->as_query,
                   '(SELECT
-                      me.id, me.source, me.owner, me.title, me.price,
-                      owner.name AS owner_name
+                      me.id, me.source, me.owner, me.title, me.price, owner.name
                     FROM books me
                     JOIN owners owner ON owner.id = me.owner
                     WHERE ( source = ? )
-                    ORDER BY me.id
                     FETCH FIRST 1 ROWS ONLY
                    )',
                   [ [ { sqlt_datatype => 'varchar', sqlt_size => 100, dbic_colname => 'source' }