Revert "Add support for NULLS FIRST/LAST in ORDER BY"

[dbsrgits/SQL-Abstract.git] / t / 06order_by.t

diff --git a/t/06order_by.t b/t/06order_by.t
index d924569..3a29b3d 100644 (file)
--- a/t/06order_by.t
+++ b/t/06order_by.t
@@ -104,25 +104,10 @@ my @cases =
     expects_quoted => ' ORDER BY colA ASC, colB LIKE ? DESC, colC LIKE ? ASC',
     bind => [qw/test tost/],
    },
-   {
-    given => [ { -ASC => 'colA', -NULLS => 'FIRST' }, { -DESC => 'colB', -NULLS => 'LAST' } ],
-    expects => ' ORDER BY colA ASC NULLS FIRST, colB DESC NULLS LAST',
-    expects_quoted => ' ORDER BY `colA` ASC NULLS FIRST, `colB` DESC NULLS LAST',
-   },
-   {
-    given => [ { -asc => 'colA', -nulls => 'first' }, { -desc => 'colB', -nulls => 'last' } ],
-    expects => ' ORDER BY colA ASC NULLS FIRST, colB DESC NULLS LAST',
-    expects_quoted => ' ORDER BY `colA` ASC NULLS FIRST, `colB` DESC NULLS LAST',
-   },
-   {
-    given => { -asc => [qw/colA colB/], -nulls => 'first' } ,
-    expects => ' ORDER BY colA ASC NULLS FIRST, colB ASC NULLS FIRST',
-    expects_quoted => ' ORDER BY `colA` ASC NULLS FIRST, `colB` ASC NULLS FIRST',
-   },
   );
 
 
-plan tests => (scalar(@cases) * 2) + 4;
+plan tests => (scalar(@cases) * 2) + 2;
 
 my $sql  = SQL::Abstract->new;
 my $sqlq = SQL::Abstract->new({quote_char => '`'});
@@ -149,24 +134,12 @@ for my $case( @cases) {
 
 throws_ok (
   sub { $sql->_order_by({-desc => 'colA', -asc => 'colB' }) },
-  qr/hash passed .+ must have exactly one of/,
+  qr/hash passed .+ must have exactly one key/,
   'Undeterministic order exception',
 );
 
 throws_ok (
   sub { $sql->_order_by({-desc => [ qw/colA colB/ ], -asc => [ qw/colC colD/ ] }) },
-  qr/hash passed .+ must have exactly one of/,
+  qr/hash passed .+ must have exactly one key/,
   'Undeterministic order exception',
 );
-
-throws_ok(
-  sub { $sql->_order_by({-wibble => "fleem" }) },
-  qr/invalid key in hash/,
-  'Invalid order exception',
-);
-
-throws_ok(
-  sub { $sql->_order_by({-nulls => "fleem" }) },
-  qr/invalid value for -nulls/,
-  'Invalid nulls exception',
-);