Handle NULLS clauses when mangling ordering

[dbsrgits/DBIx-Class.git] / t / sqlmaker / limit_dialects / toplimit.t

diff --git a/t/sqlmaker/limit_dialects/toplimit.t b/t/sqlmaker/limit_dialects/toplimit.t
index 61b5498..580dee6 100644 (file)
--- a/t/sqlmaker/limit_dialects/toplimit.t
+++ b/t/sqlmaker/limit_dialects/toplimit.t
@@ -1,10 +1,11 @@
+BEGIN { do "./t/lib/ANFANG.pm" or die ( $@ || $! ) }
+
 use strict;
 use warnings;
 
 use Test::More;
-use lib qw(t/lib);
-use DBICTest;
-use DBIC::SqlMakerTest;
+
+use DBICTest ':DiffSQL';
 
 my $schema = DBICTest->init_schema;
 
@@ -30,7 +31,7 @@ for my $null_order (
   is_same_sql_bind(
       $rs->as_query,
       '(SELECT TOP 2
-            id, source, owner, price, owner__id, owner__name
+            me.id, me.source, me.owner, me.price, owner__id, owner__name
           FROM (
             SELECT TOP 5
                 me.id, me.source, me.owner, me.price, owner.id AS owner__id, owner.name AS owner__name
@@ -89,58 +90,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 => [
@@ -149,10 +150,21 @@ 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 => [
+        { -asc => 'title', -nulls => 'first' },
+        { -desc => 'bar', -nulls => 'last' },
+    ],
+    order_inner => 'title ASC NULLS FIRST, bar DESC NULLS LAST',
+    order_outer => 'ORDER__BY__001 DESC NULLS LAST, ORDER__BY__002 ASC NULLS FIRST',
+    order_req => 'ORDER__BY__001 ASC NULLS FIRST, ORDER__BY__002 DESC NULLS LAST',
+    exselect_outer => 'ORDER__BY__001, ORDER__BY__002',
+    exselect_inner => 'title AS ORDER__BY__001, bar AS ORDER__BY__002',
   },
 ) {
   my $o_sel = $ord_set->{exselect_outer}
@@ -166,11 +178,10 @@ for my $ord_set (
 
   is_same_sql_bind(
     $books_45_and_owners->search ({}, {order_by => $ord_set->{order_by}})->as_query,
-    "(SELECT TOP 2
-          id, source, owner, price, owner__id, owner__name
+    "(SELECT me.id, me.source, me.owner, me.price, owner__id, owner__name
         FROM (
           SELECT TOP 2
-              id, source, owner, price, owner__id, owner__name$o_sel
+              me.id, me.source, me.owner, me.price, owner__id, owner__name$o_sel
             FROM (
               SELECT TOP 5
                   me.id, me.source, me.owner, me.price, owner.id AS owner__id, owner.name AS owner__name$i_sel
@@ -193,22 +204,22 @@ 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 TOP 2 id, source, owner, price, ORDER__BY__1 AS title
+        SELECT me.id, me.source, me.owner, me.price, me.title
           FROM (
             SELECT TOP 2
-                id, source, owner, price, ORDER__BY__1
+                me.id, me.source, me.owner, me.price, me.title
               FROM (
                 SELECT TOP 5
-                    me.id, me.source, me.owner, me.price, title AS ORDER__BY__1
+                    me.id, me.source, me.owner, me.price, me.title
                   FROM books me
                   JOIN owners owner ON owner.id = me.owner
                 WHERE ( source = ? )
                 GROUP BY title
                 ORDER BY title
               ) me
-            ORDER BY ORDER__BY__1 DESC
+            ORDER BY title DESC
           ) me
-        ORDER BY ORDER__BY__1
+        ORDER BY title
       ) me
       JOIN owners owner ON owner.id = me.owner
     WHERE ( source = ? )
@@ -231,11 +242,10 @@ my $rs_selectas_top = $schema->resultset ('BooksInLibrary')->search ({}, {
 is_same_sql_bind( $rs_selectas_top->search({})->as_query,
                   '(SELECT
                       TOP 1 me.id, me.source, me.owner, me.title, me.price,
-                      owner.name AS owner_name
+                      owner.name
                     FROM books me
                     JOIN owners owner ON owner.id = me.owner
                     WHERE ( source = ? )
-                    ORDER BY me.id
                   )',
                   [ [ { sqlt_datatype => 'varchar', sqlt_size => 100, dbic_colname => 'source' }
                     => 'Library' ] ],
@@ -265,7 +275,7 @@ my $rs_selectas_rel = $schema->resultset('BooksInLibrary')->search( { -exists =>
 
 is_same_sql_bind(
   $rs_selectas_rel->as_query,
-  '(SELECT TOP 1 me.id, me.owner  FROM books me WHERE ( ( (EXISTS (SELECT COUNT( * ) FROM owners owner WHERE ( books.owner = owner.id ))) AND source = ? ) )   ORDER BY me.id)',
+  '(SELECT TOP 1 me.id, me.owner  FROM books me WHERE ( ( (EXISTS (SELECT COUNT( * ) FROM owners owner WHERE ( books.owner = owner.id ))) AND source = ? ) ) )',
   [
     [ { sqlt_datatype => 'varchar', sqlt_size => 100, dbic_colname => 'source' } => 'Library' ],
   ],