use SQL::Abstract::Test import => ['is_same_sql_bind'];
use Data::Dumper;
+use Storable qw/dclone/;
use SQL::Abstract;
=begin
where => { x => {
-or => { '!=', 1, '>=', 2 }, -like => 'x%'
}},
- stmt => 'WHERE ( ( x LIKE ? AND ( x != ? OR x >= ? ) ) )',
+ stmt => 'WHERE x LIKE ? AND ( x != ? OR x >= ? )',
bind => [qw/x% 1 2/],
},
{
where => { -and => [a => 1, b => 2, k => [11, 12] ], x => 9, -or => { c => 3, d => 4, l => { '=' => [21, 22] } } },
- stmt => 'WHERE a = ? AND b = ? AND (k = ? OR k = ?) AND ((l = ? OR l = ?) OR c = ? OR d = ? ) AND x = ?',
- bind => [qw/1 2 11 12 21 22 3 4 9/],
+ stmt => 'WHERE a = ? AND b = ? AND (k = ? OR k = ?) AND (c = ? OR d = ? OR (l = ? OR l = ?) ) AND x = ?',
+ bind => [qw/1 2 11 12 3 4 21 22 9/],
},
{
# explicit OR logic in arrays should leave everything intact
args => { logic => 'or' },
where => { -and => [a => 1, b => 2, k => [11, 12] ], x => 9, -or => { c => 3, d => 4, l => { '=' => [21, 22] } } },
- stmt => 'WHERE a = ? AND b = ? AND (k = ? OR k = ?) AND ( l = ? OR l = ? OR c = ? OR d = ? ) AND x = ? ',
- bind => [qw/1 2 11 12 21 22 3 4 9/],
+ stmt => 'WHERE a = ? AND b = ? AND (k = ? OR k = ?) AND ( c = ? OR d = ? OR l = ? OR l = ? ) AND x = ? ',
+ bind => [qw/1 2 11 12 3 4 21 22 9/],
},
{
},
);
-plan tests => @and_or_tests*3 + @numbered_mods*4;
+my @nest_tests = (
+ {
+ where => {a => 1, -nest => [b => 2, c => 3]},
+ stmt => 'WHERE ( ( (b = ? OR c = ?) AND a = ? ) )',
+ bind => [qw/2 3 1/],
+ },
+ {
+ where => {a => 1, -nest => {b => 2, c => 3}},
+ stmt => 'WHERE ( ( (b = ? AND c = ?) AND a = ? ) )',
+ bind => [qw/2 3 1/],
+ },
+ {
+ where => {a => 1, -or => {-nest => {b => 2, c => 3}}},
+ stmt => 'WHERE ( ( (b = ? AND c = ?) AND a = ? ) )',
+ bind => [qw/2 3 1/],
+ },
+ {
+ where => {a => 1, -or => {-nest => [b => 2, c => 3]}},
+ stmt => 'WHERE ( ( (b = ? OR c = ?) AND a = ? ) )',
+ bind => [qw/2 3 1/],
+ },
+ {
+ where => {a => 1, -nest => {-or => {b => 2, c => 3}}},
+ stmt => 'WHERE ( ( (b = ? OR c = ?) AND a = ? ) )',
+ bind => [qw/2 3 1/],
+ },
+ {
+ where => [a => 1, -nest => {b => 2, c => 3}, -nest => [d => 4, e => 5]],
+ stmt => 'WHERE ( ( a = ? OR ( b = ? AND c = ? ) OR ( d = ? OR e = ? ) ) )',
+ bind => [qw/1 2 3 4 5/],
+ },
+);
+
+plan tests => @and_or_tests*4 + @numbered_mods*4 + @nest_tests*2;
for my $case (@and_or_tests) {
TODO: {
my @w;
local $SIG{__WARN__} = sub { push @w, @_ };
+
my $sql = SQL::Abstract->new ($case->{args} || {});
+ my $where_copy = dclone($case->{where});
+
lives_ok (sub {
my ($stmt, @bind) = $sql->where($case->{where});
is_same_sql_bind(
});
is (@w, 0, 'No warnings within and-or tests')
|| diag join "\n", 'Emitted warnings:', @w;
+
+ is_deeply ($case->{where}, $where_copy, 'Where conditions unchanged');
+ }
+}
+
+for my $case (@nest_tests) {
+ TODO: {
+ local $TODO = $case->{todo} if $case->{todo};
+
+ local $SQL::Abstract::Test::parenthesis_significant = 1;
+ local $Data::Dumper::Terse = 1;
+
+ my $sql = SQL::Abstract->new ($case->{args} || {});
+ lives_ok (sub {
+ my ($stmt, @bind) = $sql->where($case->{where});
+ is_same_sql_bind(
+ $stmt,
+ \@bind,
+ $case->{stmt},
+ $case->{bind},
+ )
+ || diag "Search term:\n" . Dumper $case->{where};
+ });
}
}
+
+
my $w_str = "\QUse of [and|or|nest]_N modifiers is deprecated and will be removed in SQLA v2.0\E";
for my $case (@numbered_mods) {
+ TODO: {
+ local $TODO = $case->{todo} if $case->{todo};
+
local $Data::Dumper::Terse = 1;
my @w;
is (@non_match, 0, 'All warnings match the deprecation message')
|| diag join "\n", 'Rogue warnings:', @non_match;
+ }
}