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

diff --git a/t/sqlmaker/limit_dialects/fetch_first.t b/t/sqlmaker/limit_dialects/fetch_first.t
index f229f4e..7a282e9 100644
--- a/t/sqlmaker/limit_dialects/fetch_first.t
+++ b/t/sqlmaker/limit_dialects/fetch_first.t
@@ -12,7 +12,10 @@ my $schema = DBICTest->init_schema;
 delete $schema->storage->_sql_maker->{_cached_syntax};
 $schema->storage->_sql_maker->limit_dialect ('FetchFirst');
 
-my $books_45_and_owners = $schema->resultset ('BooksInLibrary')->search ({}, { prefetch => 'owner', rows => 2, offset => 3 });
+my $books_45_and_owners = $schema->resultset ('BooksInLibrary')->search ({}, {
+  prefetch => 'owner', rows => 2, offset => 3,
+  columns => [ grep { $_ ne 'title' } $schema->source('BooksInLibrary')->columns ],
+});
 
 for my $null_order (
   undef,
@@ -24,9 +27,9 @@ 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, title, price, owner__id, owner__name
+      '(SELECT id, source, owner, price, owner__id, owner__name
           FROM (
-            SELECT me.id, me.source, me.owner, me.title, me.price, owner.id AS owner__id, owner.name AS owner__name
+            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 = ? )
@@ -44,72 +47,72 @@ for my $null_order (
 
 for my $ord_set (
   {
-    order_by => \'foo DESC',
-    order_inner => 'foo DESC',
+    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 => 'foo AS ORDER__BY__1',
+    exselect_inner => 'title AS ORDER__BY__1',
   },
   {
-    order_by => { -asc => 'foo'  },
-    order_inner => 'foo ASC',
+    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 => 'foo AS ORDER__BY__1',
+    exselect_inner => 'title AS ORDER__BY__1',
   },
   {
-    order_by => { -desc => 'foo' },
-    order_inner => 'foo DESC',
+    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 => 'foo AS ORDER__BY__1',
+    exselect_inner => 'title AS ORDER__BY__1',
   },
   {
-    order_by => 'foo',
-    order_inner => 'foo',
+    order_by => 'title',
+    order_inner => 'title',
     order_outer => 'ORDER__BY__1 DESC',
     order_req => 'ORDER__BY__1',
     exselect_outer => 'ORDER__BY__1',
-    exselect_inner => 'foo AS ORDER__BY__1',
+    exselect_inner => 'title AS ORDER__BY__1',
   },
   {
-    order_by => [ qw{ foo me.owner}   ],
-    order_inner => 'foo, me.owner',
+    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 => 'foo AS ORDER__BY__1',
+    exselect_inner => 'title AS ORDER__BY__1',
   },
   {
-    order_by => ['foo', { -desc => 'bar' } ],
-    order_inner => 'foo, bar DESC',
+    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 => 'foo AS ORDER__BY__1, bar AS ORDER__BY__2',
+    exselect_inner => 'title AS ORDER__BY__1, bar AS ORDER__BY__2',
   },
   {
-    order_by => { -asc => [qw{ foo bar }] },
-    order_inner => 'foo ASC, bar ASC',
+    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 => 'foo AS ORDER__BY__1, bar AS ORDER__BY__2',
+    exselect_inner => 'title AS ORDER__BY__1, bar AS ORDER__BY__2',
   },
   {
     order_by => [
-      'foo',
+      'title',
       { -desc => [qw{bar}] },
       { -asc  => [qw{me.owner sensors}]},
     ],
-    order_inner => 'foo, bar DESC, me.owner ASC, sensors ASC',
+    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 => 'foo AS ORDER__BY__1, bar AS ORDER__BY__2, sensors AS ORDER__BY__3',
+    exselect_inner => 'title AS ORDER__BY__1, bar AS ORDER__BY__2, sensors AS ORDER__BY__3',
   },
 ) {
   my $o_sel = $ord_set->{exselect_outer}
@@ -123,11 +126,11 @@ for my $ord_set (
 
   is_same_sql_bind(
     $books_45_and_owners->search ({}, {order_by => $ord_set->{order_by}})->as_query,
-    "(SELECT id, source, owner, title, price, owner__id, owner__name
+    "(SELECT id, source, owner, price, owner__id, owner__name
         FROM (
-          SELECT id, source, owner, title, price, owner__id, owner__name$o_sel
+          SELECT id, source, owner, price, owner__id, owner__name$o_sel
             FROM (
-              SELECT me.id, me.source, me.owner, me.title, me.price, owner.id AS owner__id, owner.name AS owner__name$i_sel
+              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 = ? )
@@ -148,13 +151,13 @@ for my $ord_set (
 # with groupby
 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.title, me.price, owner.id, owner.name
+  '(SELECT me.id, me.source, me.owner, me.price, owner.id, owner.name
       FROM (
-        SELECT id, source, owner, title, price
+        SELECT id, source, owner, price, ORDER__BY__1 AS title
           FROM (
-            SELECT id, source, owner, title, price
+            SELECT id, source, owner, price, ORDER__BY__1
               FROM (
-                SELECT me.id, me.source, me.owner, me.title, me.price
+                SELECT me.id, me.source, me.owner, me.price, title AS ORDER__BY__1
                   FROM books me
                   JOIN owners owner ON owner.id = me.owner
                 WHERE ( source = ? )
@@ -162,10 +165,10 @@ is_same_sql_bind (
                 ORDER BY title
                 FETCH FIRST 5 ROWS ONLY
               ) me
-            ORDER BY title DESC
+            ORDER BY ORDER__BY__1 DESC
             FETCH FIRST 2 ROWS ONLY
           ) me
-        ORDER BY title
+        ORDER BY ORDER__BY__1
         FETCH FIRST 2 ROWS ONLY
       ) me
       JOIN owners owner ON owner.id = me.owner
@@ -202,9 +205,9 @@ is_same_sql_bind( $rs_selectas_top->search({})->as_query,
 
 {
   my $rs = $schema->resultset('Artist')->search({}, {
-    columns => 'name',
+    columns => 'artistid',
     offset => 1,
-    order_by => 'name',
+    order_by => 'artistid',
   });
   local $rs->result_source->{name} = "weird \n newline/multi \t \t space containing \n table";