X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F06order_by.t;h=7d1213e9f88a7411048e6f7a333cae9b98f12159;hb=ca4f826a37ccb5194b0b5b9b4190b4007d647d9c;hp=08477ec1f3e19df44dda434f0834f43236d9dcdd;hpb=c461c25c909bf7be7f4562f564a82af90b6fb71a;p=dbsrgits%2FSQL-Abstract.git

diff --git a/t/06order_by.t b/t/06order_by.t
index 08477ec..7d1213e 100644
--- a/t/06order_by.t
+++ b/t/06order_by.t
@@ -1,13 +1,12 @@
-#!/usr/bin/perl
-
 use strict;
 use warnings;
 use Test::More;
+use Test::Exception;
 
 use SQL::Abstract;
 
-use SQL::Abstract::Test qw/is_same_sql_bind/;
-my @cases = 
+use SQL::Abstract::Test import => ['is_same_sql_bind'];
+my @cases =
   (
    {
     given => \'colA DESC',
@@ -19,11 +18,21 @@ my @cases =
     expects => ' ORDER BY colA',
     expects_quoted => ' ORDER BY `colA`',
    },
+   {  # it may look odd, but this is the desired behaviour (mst)
+    given => 'colA DESC',
+    expects => ' ORDER BY colA DESC',
+    expects_quoted => ' ORDER BY `colA DESC`',
+   },
    {
     given => [qw/colA colB/],
     expects => ' ORDER BY colA, colB',
     expects_quoted => ' ORDER BY `colA`, `colB`',
    },
+   {  # it may look odd, but this is the desired behaviour (mst)
+    given => ['colA ASC', 'colB DESC'],
+    expects => ' ORDER BY colA ASC, colB DESC',
+    expects_quoted => ' ORDER BY `colA ASC`, `colB DESC`',
+   },
    {
     given => {-asc => 'colA'},
     expects => ' ORDER BY colA ASC',
@@ -44,14 +53,90 @@ my @cases =
     expects => ' ORDER BY colA, colB DESC',
     expects_quoted => ' ORDER BY `colA`, `colB` DESC',
    },
+   {
+    given => undef,
+    expects => '',
+    expects_quoted => '',
+   },
+
+   {
+    given => [{-desc => [ qw/colA colB/ ] }],
+    expects => ' ORDER BY colA DESC, colB DESC',
+    expects_quoted => ' ORDER BY `colA` DESC, `colB` DESC',
+   },
+   {
+    given => [{-desc => [ qw/colA colB/ ] }, {-asc => 'colC'}],
+    expects => ' ORDER BY colA DESC, colB DESC, colC ASC',
+    expects_quoted => ' ORDER BY `colA` DESC, `colB` DESC, `colC` ASC',
+   },
+   {
+    given => [{-desc => [ qw/colA colB/ ] }, {-asc => [ qw/colC colD/ ] }],
+    expects => ' ORDER BY colA DESC, colB DESC, colC ASC, colD ASC',
+    expects_quoted => ' ORDER BY `colA` DESC, `colB` DESC, `colC` ASC, `colD` ASC',
+   },
+   {
+    given => [{-desc => [ qw/colA colB/ ] }, {-desc => 'colC' }],
+    expects => ' ORDER BY colA DESC, colB DESC, colC DESC',
+    expects_quoted => ' ORDER BY `colA` DESC, `colB` DESC, `colC` DESC',
+   },
+   {
+    given => [{ -asc => 'colA' }, { -desc => [qw/colB/] }, { -asc => [qw/colC colD/] }],
+    expects => ' ORDER BY colA ASC, colB DESC, colC ASC, colD ASC',
+    expects_quoted => ' ORDER BY `colA` ASC, `colB` DESC, `colC` ASC, `colD` ASC',
+   },
+   {
+    given => { -desc => \['colA LIKE ?', 'test'] },
+    expects => ' ORDER BY colA LIKE ? DESC',
+    expects_quoted => ' ORDER BY colA LIKE ? DESC',
+    bind => ['test'],
+   },
+   {
+    given => \['colA LIKE ? DESC', 'test'],
+    expects => ' ORDER BY colA LIKE ? DESC',
+    expects_quoted => ' ORDER BY colA LIKE ? DESC',
+    bind => ['test'],
+   },
+   {
+    given => [ { -asc => \['colA'] }, { -desc => \['colB LIKE ?', 'test'] }, { -asc => \['colC LIKE ?', 'tost'] }],
+    expects => ' ORDER BY colA ASC, colB LIKE ? DESC, colC LIKE ? ASC',
+    expects_quoted => ' ORDER BY colA ASC, colB LIKE ? DESC, colC LIKE ? ASC',
+    bind => [qw/test tost/],
+   },
   );
 
 my $sql  = SQL::Abstract->new;
 my $sqlq = SQL::Abstract->new({quote_char => '`'});
 
-plan tests => (scalar(@cases) * 2);
+for my $case (@cases) {
+  my ($stat, @bind);
+
+  ($stat, @bind) = $sql->where(undef, $case->{given});
+  is_same_sql_bind (
+    $stat,
+    \@bind,
+    $case->{expects},
+    $case->{bind} || [],
+  );
 
-for my $case( @cases){
-  is($sql->_order_by($case->{given}), $case->{expects});
-  is($sqlq->_order_by($case->{given}), $case->{expects_quoted});
+  ($stat, @bind) = $sqlq->where(undef, $case->{given});
+  is_same_sql_bind (
+    $stat,
+    \@bind,
+    $case->{expects_quoted},
+    $case->{bind} || [],
+  );
 }
+
+throws_ok (
+  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({-desc => [ qw/colA colB/ ], -asc => [ qw/colC colD/ ] }) },
+  qr/hash passed .+ must have exactly one key/,
+  'Undeterministic order exception',
+);
+
+done_testing;