-#!/usr/bin/perl
-
use strict;
use warnings;
use Test::More;
use SQL::Abstract;
use SQL::Abstract::Test import => ['is_same_sql_bind'];
-my @cases =
+my @cases =
(
{
given => \'colA DESC',
expects => '',
expects_quoted => '',
},
+ {
+ given => [ {} ],
+ expects => '',
+ expects_quoted => '',
+ },
{
given => [{-desc => [ qw/colA colB/ ] }],
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,
$case->{bind} || [],
);
- ($stat, @bind) = $sqlq->_order_by($case->{given});
+ ($stat, @bind) = $sqlq->where(undef, $case->{given});
is_same_sql_bind (
$stat,
\@bind,
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;