X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F06order_by.t;h=0d340ae961baa7c2b0b2c39cd1830e5f67d8f396;hb=cf5b7ab163f8ac123ebc9bb1156e79646cd5bd2f;hp=f0fb47ea3fba3eef47d001337d8cf086fd5e0a24;hpb=2266ca5c0bf34c24ba7fbf6448ad1c34a082f240;p=scpubgit%2FQ-Branch.git

diff --git a/t/06order_by.t b/t/06order_by.t
index f0fb47e..0d340ae 100644
--- a/t/06order_by.t
+++ b/t/06order_by.t
@@ -1,5 +1,3 @@
-#!/usr/bin/perl
-
 use strict;
 use warnings;
 use Test::More;
@@ -8,7 +6,7 @@ use Test::Exception;
 use SQL::Abstract;
 
 use SQL::Abstract::Test import => ['is_same_sql_bind'];
-my @cases = 
+my @cases =
   (
    {
     given => \'colA DESC',
@@ -60,6 +58,11 @@ my @cases =
     expects => '',
     expects_quoted => '',
    },
+   {
+    given => [ {} ],
+    expects => '',
+    expects_quoted => '',
+   },
 
    {
     given => [{-desc => [ qw/colA colB/ ] }],
@@ -104,33 +107,15 @@ 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;
-
 my $sql  = SQL::Abstract->new;
 my $sqlq = SQL::Abstract->new({quote_char => '`'});
 
-for my $case( @cases) {
+for my $case (@cases) {
   my ($stat, @bind);
 
-  ($stat, @bind) = $sql->_order_by($case->{given});
+  ($stat, @bind) = $sql->where(undef, $case->{given});
   is_same_sql_bind (
     $stat,
     \@bind,
@@ -138,7 +123,7 @@ for my $case( @cases) {
     $case->{bind} || [],
   );
 
-  ($stat, @bind) = $sqlq->_order_by($case->{given});
+  ($stat, @bind) = $sqlq->where(undef, $case->{given});
   is_same_sql_bind (
     $stat,
     \@bind,
@@ -149,24 +134,20 @@ 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/,
+  sub { $sql->_order_by([ {-desc => 'colA', -asc => 'colB' } ]) },
+  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({-desc => [ qw/colA colB/ ], -asc => [ qw/colC colD/ ] }) },
+  qr/hash passed .+ must have exactly one key/,
+  'Undeterministic order exception',
 );
 
-throws_ok(
-  sub { $sql->_order_by({-nulls => "fleem" }) },
-  qr/invalid value for -nulls/,
-  'Invalid nulls exception',
-);
+done_testing;