Remove CR/LF and exec bits

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

diff --git a/t/02where.t b/t/02where.t
old mode 100755 (executable)
new mode 100644 (file)
index 50209d2..c875047
--- 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/],
     },
 
@@ -132,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/],
     },
@@ -147,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] },
@@ -160,19 +164,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 => [],
     },
 
@@ -210,82 +218,6 @@ my @handle_tests = (
    },
 );
 
-# add extra modifier tests, based on 2 outcomes
-my $mod_and = {
-  stmt => 'WHERE ( foo = ? OR bar = ? ) AND baz = ? ',
-  bind => [qw/1 2 3/],
-};
-my $mod_or = {
-  stmt => 'WHERE ( foo = ? OR 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,
-   },
-   {
-      where => { -and => [
-        [ foo => 1, bar => 2 ],
-        baz => 3,
-      ]},
-      %$mod_and,
-   },
-
-   # test modifiers within arrayrefs
-   {
-      where => [ -or => [
-        [ foo => 1, bar => 2 ],
-        baz => 3,
-      ]],
-      %$mod_or,
-   },
-   {
-      where => [ -and => [
-        [ foo => 1, bar => 2 ],
-        baz => 3,
-      ]],
-      %$mod_and,
-   },
-
-   # test conflicting modifiers within hashrefs (last one should win?)
-   {
-      where => { -and => [ -or =>
-        [ foo => 1, bar => 2 ],
-        baz => 3,
-      ]},
-      %$mod_or,
-   },
-   {
-      where => { -or => [ -and =>
-        [ foo => 1, bar => 2 ],
-        baz => 3,
-      ]},
-      %$mod_and,
-   },
-
-   # test conflicting modifiers within arrayrefs (last one should win?)
-   {
-      where => [ -and => [ -or =>
-        [ foo => 1, bar => 2 ],
-        baz => 3,
-      ]],
-      %$mod_or,
-   },
-   {
-      where => [ -or => [ -and =>
-        [ foo => 1, bar => 2 ],
-        baz => 3,
-      ]],
-      %$mod_and,
-   },
-);
-
 plan tests => ( @handle_tests * 2 ) + 1;
 
 for my $case (@handle_tests) {