X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F06order_by.t;h=e3b94f704421bc63d9fbdff523b000f231515624;hb=dd1d0dbf25425dbd05193ec6d5453e9170eb832c;hp=71b9dc2f6c645060224889e6379424f81c1220c9;hpb=952f9e2dcb459ab5854a9fb0e49e63b5473778d3;p=dbsrgits%2FSQL-Abstract.git

diff --git a/t/06order_by.t b/t/06order_by.t
index 71b9dc2..e3b94f7 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',
@@ -86,17 +84,47 @@ my @cases =
     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/],
+   },
   );
 
-
-plan tests => (scalar(@cases) * 2) + 2;
-
 my $sql  = SQL::Abstract->new;
 my $sqlq = SQL::Abstract->new({quote_char => '`'});
 
-for my $case( @cases){
-  is($sql->_order_by($case->{given}), $case->{expects});
-  is($sqlq->_order_by($case->{given}), $case->{expects_quoted});
+for my $case (@cases) {
+  my ($stat, @bind);
+
+  ($stat, @bind) = $sql->where(undef, $case->{given});
+  is_same_sql_bind (
+    $stat,
+    \@bind,
+    $case->{expects},
+    $case->{bind} || [],
+  );
+
+  ($stat, @bind) = $sqlq->where(undef, $case->{given});
+  is_same_sql_bind (
+    $stat,
+    \@bind,
+    $case->{expects_quoted},
+    $case->{bind} || [],
+  );
 }
 
 throws_ok (
@@ -106,7 +134,15 @@ throws_ok (
 );
 
 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;