X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fsqlmaker%2Flimit_dialects%2Ffetch_first.t;h=4665b4cf7164779399cf3ad295a2a94777f0f96a;hb=refs%2Fheads%2Fcurrent%2Fdq;hp=ed532a44a6e0996d8fbce38708051ac5a2ab809a;hpb=a67b4f3cace12da64c30ce6ae1b2593c077438a4;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/sqlmaker/limit_dialects/fetch_first.t b/t/sqlmaker/limit_dialects/fetch_first.t
index ed532a4..4665b4c 100644
--- a/t/sqlmaker/limit_dialects/fetch_first.t
+++ b/t/sqlmaker/limit_dialects/fetch_first.t
@@ -32,7 +32,7 @@ for my $null_order (
             SELECT me.id, me.source, me.owner, me.price, owner.id AS owner__id, owner.name AS owner__name
               FROM books me
               JOIN owners owner ON owner.id = me.owner
-            WHERE source = ?
+            WHERE ( source = ? )
             ORDER BY me.id
             FETCH FIRST 5 ROWS ONLY
           ) me
@@ -49,23 +49,23 @@ for my $ord_set (
   {
     order_by => \'title DESC',
     order_inner => 'title DESC',
-    order_outer => 'ORDER__BY__001',
+    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',
+    order_inner => 'title ASC',
     order_outer => 'ORDER__BY__001 DESC',
-    order_req => 'ORDER__BY__001',
+    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__001',
+    order_outer => 'ORDER__BY__001 ASC',
     order_req => 'ORDER__BY__001 DESC',
     exselect_outer => 'ORDER__BY__001',
     exselect_inner => 'title AS ORDER__BY__001',
@@ -89,16 +89,16 @@ for my $ord_set (
   {
     order_by => ['title', { -desc => 'bar' } ],
     order_inner => 'title, bar DESC',
-    order_outer => 'ORDER__BY__001 DESC, ORDER__BY__002',
+    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, bar',
+    order_inner => 'title ASC, bar ASC',
     order_outer => 'ORDER__BY__001 DESC, ORDER__BY__002 DESC',
-    order_req => 'ORDER__BY__001, ORDER__BY__002',
+    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',
   },
@@ -108,12 +108,21 @@ for my $ord_set (
       { -desc => [qw{bar}] },
       { -asc  => [qw{me.owner sensors}]},
     ],
-    order_inner => 'title, bar DESC, me.owner, sensors',
-    order_outer => 'ORDER__BY__001 DESC, ORDER__BY__002, me.owner DESC, ORDER__BY__003 DESC',
-    order_req => 'ORDER__BY__001, ORDER__BY__002 DESC, me.owner, ORDER__BY__003',
+    order_inner => 'title, bar DESC, me.owner ASC, sensors ASC',
+    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}
     ? ', ' . $ord_set->{exselect_outer}
@@ -124,8 +133,13 @@ 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,
+    $rs->as_query,
     "(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, owner__name$o_sel
@@ -133,7 +147,7 @@ for my $ord_set (
               SELECT me.id, me.source, me.owner, me.price, owner.id AS owner__id, owner.name AS owner__name$i_sel
                 FROM books me
                 JOIN owners owner ON owner.id = me.owner
-              WHERE source = ?
+              WHERE ( source = ? )
               ORDER BY $ord_set->{order_inner}
               FETCH FIRST 5 ROWS ONLY
             ) me
@@ -145,6 +159,7 @@ for my $ord_set (
     [ [ { sqlt_datatype => 'varchar', sqlt_size => 100, dbic_colname => 'source' }
         => 'Library' ] ],
   );
+
 }
 
 # with groupby
@@ -159,7 +174,7 @@ is_same_sql_bind (
                 SELECT me.id, me.source, me.owner, me.price, me.title
                   FROM books me
                   JOIN owners owner ON owner.id = me.owner
-                WHERE source = ?
+                WHERE ( source = ? )
                 GROUP BY title
                 ORDER BY title
                 FETCH FIRST 5 ROWS ONLY
@@ -170,7 +185,7 @@ is_same_sql_bind (
         ORDER BY me.title
       ) me
       JOIN owners owner ON owner.id = me.owner
-    WHERE source = ?
+    WHERE ( source = ? )
     ORDER BY title
   )',
   [ map { [
@@ -192,7 +207,7 @@ is_same_sql_bind( $rs_selectas_top->search({})->as_query,
                       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 = ?
+                    WHERE ( source = ? )
                     FETCH FIRST 1 ROWS ONLY
                    )',
                   [ [ { sqlt_datatype => 'varchar', sqlt_size => 100, dbic_colname => 'source' }