fixed the failing tests

[scpubgit/Q-Branch.git] / t / 02where.t

diff --git a/t/02where.t b/t/02where.t
old mode 100644 (file)
new mode 100755 (executable)
index 87ce1c2..1bdb8cb
--- a/t/02where.t
+++ b/t/02where.t
@@ -6,6 +6,7 @@ use Test::More;
 use Test::Exception;
 use SQL::Abstract::Test import => ['is_same_sql_bind'];
 
+use Data::Dumper;
 use SQL::Abstract;
 
 # Make sure to test the examples, since having them break is somewhat
@@ -82,8 +83,9 @@ my @handle_tests = (
         },
         order => \'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",
+#
+# acked by RIBASUSHI
+        stmt => "WHERE ( ( completion_date BETWEEN ? AND ? ) AND status = ? ) ORDER BY ticket, requestor",
         bind => [qw/2002-10-01 2003-02-06 completed/],
     },
 
@@ -131,7 +133,8 @@ my @handle_tests = (
         },
         order => \'requestor, ticket',
 #LDNOTE: modified parentheses
-#        stmt => " WHERE ( priority BETWEEN ? AND ? AND requestor IS NULL ) ORDER BY requestor, ticket",
+#
+# acked by RIBASUSHI
         stmt => " WHERE ( ( priority BETWEEN ? AND ? ) AND requestor IS NULL ) ORDER BY requestor, ticket",
         bind => [qw/1 3/],
     },
@@ -146,12 +149,14 @@ my @handle_tests = (
            },
         },
 # LDNOTE : modified test below, just parentheses differ
-#        stmt => " WHERE ( id = ? AND num <= ? AND num > ? )",
+#
+# acked by RIBASUSHI
         stmt => " WHERE ( id = ? AND ( num <= ? AND num > ? ) )",
         bind => [qw/1 20 10/],
     },
 
     {
+# LDNOTE 23.03.09 : modified test below, just parentheses differ
         where => { foo => {-not_like => [7,8,9]},
                    fum => {'like' => [qw/a b/]},
                    nix => {'between' => [100,200] },
@@ -159,10 +164,7 @@ my @handle_tests = (
                    wix => {'in' => [qw/zz yy/]},
                    wux => {'not_in'  => [qw/30 40/]}
                  },
-# 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 ( ?, ? ) )",
+        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 ( ?, ? ) )",
         bind => [7,8,9,'a','b',100,200,150,160,'zz','yy','30','40'],
     },
 
@@ -184,7 +186,6 @@ my @handle_tests = (
         stmt => " WHERE ( (bar > ? AND bar < ?) AND foo IN (?, ?) )",
         bind => [44, 55, 22, 33],
     },
-
    {
        where => { -and => [{}, { 'me.id' => '1'}] },
        stmt => " WHERE ( ( me.id = ? ) )",
@@ -198,28 +199,108 @@ my @handle_tests = (
    },
 
    {
-       where => \[ 'foo ?','bar' ],
-       stmt => " WHERE (foo = ?)", 
+       where => \[ 'foo = ?','bar' ],
+       stmt => " WHERE (foo = ?)",
        bind => [ "bar" ],
    },
 
    {
-       where => [ \[ 'foo ?','bar' ] ],
-       stmt => " WHERE (foo = ?)", 
+       where => [ \[ 'foo = ?','bar' ] ],
+       stmt => " WHERE (foo = ?)",
        bind => [ "bar" ],
    },
-
 );
 
+# add extra modifier tests, based on 2 outcomes
+my $mod_or_and = {
+  stmt => 'WHERE ( foo = ? OR bar = ? ) AND baz = ? ',
+  bind => [qw/1 2 3/],
+};
+my $mod_or_or = {
+  stmt => 'WHERE ( foo = ? OR bar = ? ) OR baz = ?',
+  bind => [qw/1 2 3/],
+};
+my $mod_and_or = {
+  stmt => 'WHERE ( foo = ? AND bar = ? ) OR baz = ?',
+  bind => [qw/1 2 3/],
+};
+
+push @handle_tests, (
+   # test modifiers within hashrefs
+   {
+      where => { -or => [
+        [ foo => 1, bar => 2 ],
+        baz => 3,
+      ]},
+      %$mod_or_or,
+   },
+   {
+      where => { -and => [
+        [ foo => 1, bar => 2 ],
+        baz => 3,
+      ]},
+      %$mod_or_and,
+   },
+
+   # test modifiers within arrayrefs
+   {
+      where => [ -or => [
+        [ foo => 1, bar => 2 ],
+        baz => 3,
+      ]],
+      %$mod_or_or,
+   },
+   {
+      where => [ -and => [
+        [ foo => 1, bar => 2 ],
+        baz => 3,
+      ]],
+      %$mod_or_and,
+   },
+
+   # test ambiguous modifiers within hashrefs (op extends to to immediate RHS only)
+   {
+      where => { -and => [ -or =>
+        [ foo => 1, bar => 2 ],
+        baz => 3,
+      ]},
+      %$mod_or_and,
+   },
+   {
+      where => { -or => [ -and =>
+        [ foo => 1, bar => 2 ],
+        baz => 3,
+      ]},
+      %$mod_and_or,
+   },
+
+   # test ambiguous modifiers within arrayrefs (op extends to to immediate RHS only)
+   {
+      where => [ -and => [ -or =>
+        [ foo => 1, bar => 2 ],
+        baz => 3,
+      ]],
+      %$mod_or_and,
+   },
+   {
+      where => [ -or => [ -and =>
+        [ foo => 1, bar => 2 ],
+        baz => 3,
+      ]],
+      %$mod_and_or,
+   },
+);
 
 plan tests => ( @handle_tests * 2 ) + 1;
 
 for my $case (@handle_tests) {
+    local $Data::Dumper::Terse = 1;
     my $sql = SQL::Abstract->new;
     my($stmt, @bind);
     lives_ok (sub { 
       ($stmt, @bind) = $sql->where($case->{where}, $case->{order});
-      is_same_sql_bind($stmt, \@bind, $case->{stmt}, $case->{bind});
+      is_same_sql_bind($stmt, \@bind, $case->{stmt}, $case->{bind})
+        || diag "Search term:\n" . Dumper $case->{where};
     });
 }