add support for order_by => [qw/colA colB/]

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

diff --git a/t/06order_by.t b/t/06order_by.t
index a8fc1c7..d404aa3 100644 (file)
--- a/t/06order_by.t
+++ b/t/06order_by.t
@@ -6,10 +6,7 @@ use Test::More;
 
 use SQL::Abstract;
 
-use FindBin;
-use lib "$FindBin::Bin";
-use TestSqlAbstract;
-
+use SQL::Abstract::Test import => ['is_same_sql_bind'];
 my @cases = 
   (
    {
@@ -22,11 +19,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',
@@ -47,13 +54,41 @@ 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',
+   },
+
   );
 
-my $sql  = SQL::Abstract->new;
-my $sqlq = SQL::Abstract->new({quote_char => '`'});
 
 plan tests => (scalar(@cases) * 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});