X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F06order_by.t;h=42abaa6e0d352dd8535a5da583381b8b22b5d0be;hb=26fe4d30f09137780baf6fcf0297caace0124688;hp=7d2ccf49a8424b758285c918c7973f32fd83e680;hpb=293149c55f1e9066c5e31f703aafc4a109cf0f5a;p=dbsrgits%2FSQL-Abstract.git

diff --git a/t/06order_by.t b/t/06order_by.t
index 7d2ccf4..42abaa6 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',
@@ -90,18 +88,43 @@ my @cases =
     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 (
@@ -115,3 +138,5 @@ throws_ok (
   qr/hash passed .+ must have exactly one key/,
   'Undeterministic order exception',
 );
+
+done_testing;