use warnings;
use Test::More;
use Test::Exception;
-
-plan tests => 27;
+use SQL::Abstract::Test import => ['is_same_sql_bind'];
use SQL::Abstract;
# Make sure to test the examples, since having them break is somewhat
# embarrassing. :-(
-my @handle_tests = (
+my $not_stringifiable = bless {}, 'SQLA::NotStringifiable';
+
+my@x=(
{
where => {
requestor => 'inna',
},
{
+ where => [
+ status => 'completed',
+ user => 'nwiger',
+ ],
+ stmt => " WHERE ( status = ? OR user = ? )",
+ bind => [qw/completed nwiger/],
+ },
+
+ {
where => {
user => 'nwiger',
status => 'completed'
completion_date => { 'between', ['2002-10-01', '2003-02-06'] },
},
order => \'ticket, requestor',
- stmt => " WHERE ( completion_date BETWEEN ? AND ? AND status = ? ) ORDER BY ticket, requestor",
+#LDNOTE: modified parentheses
+# stmt => " WHERE ( completion_date BETWEEN ? AND ? AND status = ? ) ORDER BY ticket, requestor",
+ stmt => " WHERE ( ( completion_date BETWEEN ? AND ? ) AND status = ? ) ORDER BY ticket, requestor",
bind => [qw/2002-10-01 2003-02-06 completed/],
},
requestor => { 'like', undef },
},
order => \'requestor, ticket',
- stmt => " WHERE ( priority BETWEEN ? AND ? AND requestor IS NULL ) ORDER BY requestor, ticket",
+#LDNOTE: modified parentheses
+# stmt => " WHERE ( priority BETWEEN ? AND ? AND requestor IS NULL ) ORDER BY requestor, ticket",
+ stmt => " WHERE ( ( priority BETWEEN ? AND ? ) AND requestor IS NULL ) ORDER BY requestor, ticket",
bind => [qw/1 3/],
},
'>' => 10,
},
},
- stmt => " WHERE ( id = ? AND num <= ? AND num > ? )",
+# LDNOTE : modified test below, just parentheses differ
+# stmt => " WHERE ( id = ? AND num <= ? AND num > ? )",
+ stmt => " WHERE ( id = ? AND ( num <= ? AND num > ? ) )",
bind => [qw/1 20 10/],
},
wix => {'in' => [qw/zz yy/]},
wux => {'not_in' => [qw/30 40/]}
},
- stmt => " WHERE ( ( ( foo NOT LIKE ? ) OR ( foo NOT LIKE ? ) OR ( foo NOT LIKE ? ) ) AND ( ( fum LIKE ? ) OR ( fum LIKE ? ) ) AND nix BETWEEN ? AND ? AND nox NOT BETWEEN ? AND ? AND wix IN ( ?, ? ) AND wux NOT IN ( ?, ? ) )",
+# LDNOTE: modified parentheses for BETWEEN (trivial).
+# Also modified the logic of "not_like" (severe, same reasons as #14 in 00where.t)
+# stmt => " WHERE ( ( ( foo NOT LIKE ? ) OR ( foo NOT LIKE ? ) OR ( foo NOT LIKE ? ) ) AND ( ( fum LIKE ? ) OR ( fum LIKE ? ) ) AND nix BETWEEN ? AND ? AND nox NOT BETWEEN ? AND ? AND wix IN ( ?, ? ) AND wux NOT IN ( ?, ? ) )",
+ stmt => " WHERE ( ( foo NOT LIKE ? AND foo NOT LIKE ? AND foo NOT LIKE ? ) AND ( ( fum LIKE ? ) OR ( fum LIKE ? ) ) AND ( nix BETWEEN ? AND ? ) AND ( nox NOT BETWEEN ? AND ? ) AND wix IN ( ?, ? ) AND wux NOT IN ( ?, ? ) )",
bind => [7,8,9,'a','b',100,200,150,160,'zz','yy','30','40'],
},
bind => [],
},
+
+ {
+ where => {
+ foo => \["IN (?, ?)", 22, 33],
+ bar => [-and => \["> ?", 44], \["< ?", 55] ],
+ },
+ stmt => " WHERE ( (bar > ? AND bar < ?) AND foo IN (?, ?) )",
+ bind => [44, 55, 22, 33],
+ },
+ {
+ where => { -and => [{}, { 'me.id' => '1'}] },
+ stmt => " WHERE ( ( me.id = ? ) )",
+ bind => [ 1 ],
+ },
+
+ {
+ where => { foo => $not_stringifiable, },
+ stmt => " WHERE ( foo = ? )",
+ bind => [ $not_stringifiable ],
+ },
+
+);my @handle_tests = (
+ {
+ where => \[ 'foo ?','bar' ],
+ stmt => " WHERE (foo = ?)",
+ bind => [ "bar" ],
+ },
+);my@x2=(
+
+ {
+ where => [ \[ 'foo ?','bar' ] ],
+ stmt => " WHERE (foo = ?)",
+ bind => [ "bar" ],
+ },
);
+
+plan tests => ( @handle_tests * 2 ) + 1;
+
for my $case (@handle_tests) {
my $sql = SQL::Abstract->new;
- my($stmt, @bind) = $sql->where($case->{where}, $case->{order});
- is($stmt, $case->{stmt});
- is_deeply(\@bind, $case->{bind});
+ my($stmt, @bind);
+ lives_ok (sub {
+ ($stmt, @bind) = $sql->where($case->{where}, $case->{order});
+ is_same_sql_bind($stmt, \@bind, $case->{stmt}, $case->{bind});
+ });
}
dies_ok {
my $sql = SQL::Abstract->new;
$sql->where({ foo => { '>=' => [] }},);
-}
+};