X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F02where.t;h=0790a64349aa1e78e33039eb271ca8dd553a819a;hb=63cb75ace0d452c22298e23916c3e1644902a960;hp=39d620e2d3bb54afeaf3cf830b66b89829391714;hpb=1610db0d05f402c04a7f747de60a7fd714231f18;p=scpubgit%2FQ-Branch.git

diff --git a/t/02where.t b/t/02where.t
old mode 100755
new mode 100644
index 39d620e..0790a64
--- a/t/02where.t
+++ b/t/02where.t
@@ -83,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/],
     },
 
@@ -116,6 +117,14 @@ my @handle_tests = (
 
     {
         where => {  
+            requestor => { '!=', ['-and', undef, ''] },
+        },
+        stmt => " WHERE ( requestor IS NOT NULL AND requestor != ? )",
+        bind => [''],
+    },
+
+    {
+        where => {  
             priority  => [ {'>', 3}, {'<', 1} ],
             requestor => { '!=', undef }, 
         },
@@ -132,7 +141,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/],
     },
@@ -147,12 +157,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] },
@@ -160,19 +172,23 @@ 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'],
     },
 
     {
         where => {
-            id  => [],
             bar => {'!=' => []},
         },
-        stmt => " WHERE ( 1=1 AND 0=1 )",
+        stmt => " WHERE ( 1=1 )",
+        bind => [],
+    },
+
+    {
+        where => {
+            id  => [],
+        },
+        stmt => " WHERE ( 0=1 )",
         bind => [],
     },
 
@@ -208,86 +224,115 @@ my @handle_tests = (
        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/],
-};
+   {
+       where => { -bool => \'function(x)' },
+       stmt => " WHERE function(x)",
+       bind => [],
+   },
 
-push @handle_tests, (
-   # test modifiers within hashrefs
    {
-      where => { -or => [
-        [ foo => 1, bar => 2 ],
-        baz => 3,
-      ]},
-      %$mod_or_or,
+       where => { -bool => 'foo' },
+       stmt => " WHERE foo",
+       bind => [],
    },
+
    {
-      where => { -and => [
-        [ foo => 1, bar => 2 ],
-        baz => 3,
-      ]},
-      %$mod_or_and,
+       where => { -and => [-bool => 'foo', -bool => 'bar'] },
+       stmt => " WHERE foo AND bar",
+       bind => [],
    },
 
-   # test modifiers within arrayrefs
    {
-      where => [ -or => [
-        [ foo => 1, bar => 2 ],
-        baz => 3,
-      ]],
-      %$mod_or_or,
+       where => { -or => [-bool => 'foo', -bool => 'bar'] },
+       stmt => " WHERE foo OR bar",
+       bind => [],
    },
+
    {
-      where => [ -and => [
-        [ foo => 1, bar => 2 ],
-        baz => 3,
-      ]],
-      %$mod_or_and,
+       where => { -not_bool => \'function(x)' },
+       stmt => " WHERE NOT function(x)",
+       bind => [],
    },
 
-   # 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 => { -not_bool => 'foo' },
+       stmt => " WHERE NOT foo",
+       bind => [],
    },
+
    {
-      where => { -or => [ -and =>
-        [ foo => 1, bar => 2 ],
-        baz => 3,
-      ]},
-      %$mod_and_or,
+       where => { -and => [-not_bool => 'foo', -not_bool => 'bar'] },
+       stmt => " WHERE (NOT foo) AND (NOT bar)",
+       bind => [],
    },
 
-   # 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 => [-not_bool => 'foo', -not_bool => 'bar'] },
+       stmt => " WHERE (NOT foo) OR (NOT bar)",
+       bind => [],
    },
+
    {
-      where => [ -or => [ -and =>
-        [ foo => 1, bar => 2 ],
-        baz => 3,
-      ]],
-      %$mod_and_or,
+       where => { -bool => \['function(?)', 20]  },
+       stmt => " WHERE function(?)",
+       bind => [20],
    },
+
+   {
+       where => { -not_bool => \['function(?)', 20]  },
+       stmt => " WHERE NOT function(?)",
+       bind => [20],
+   },
+
+   {
+       where => { -bool => { a => 1, b => 2}  },
+       stmt => " WHERE a = ? AND b = ?",
+       bind => [1, 2],
+   },
+
+   {
+       where => { -bool => [ a => 1, b => 2] },
+       stmt => " WHERE a = ? OR b = ?",
+       bind => [1, 2],
+   },
+
+   {
+       where => { -not_bool => { a => 1, b => 2}  },
+       stmt => " WHERE NOT (a = ? AND b = ?)",
+       bind => [1, 2],
+   },
+
+   {
+       where => { -not_bool => [ a => 1, b => 2] },
+       stmt => " WHERE NOT ( a = ? OR b = ? )",
+       bind => [1, 2],
+   },
+
+# Op against internal function
+   {
+       where => { bool1 => { '=' => { -not_bool => 'bool2' } } },
+       stmt => " WHERE ( bool1 = NOT(bool2) )",
+       bind => [],
+   },
+   {
+       where => { -not_bool => { -not_bool => { -not_bool => 'bool2' } } },
+       stmt => " WHERE ( NOT ( NOT ( NOT bool2 ) ) )",
+       bind => [],
+   },
+
+# Op against random functions (these two are oracle-specific)
+   {
+       where => { timestamp => { '!=' => { -trunk => \'sysdate' } } },
+       stmt => " WHERE ( timestamp != TRUNC(sysdate) )",
+       bind => [],
+   },
+   {
+       where => { timestamp => { '>=' => { -TO_DATE => '2009-12-21 00:00:00' } } },
+       stmt => " WHERE ( timestamp >= TO_DATE(?) )",
+       bind => ['2009-12-21 00:00:00'],
+   },
+
 );
 
 plan tests => ( @handle_tests * 2 ) + 1;