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 1bdb8cb..c875047
--- a/t/02where.t
+++ b/t/02where.t
@@ -170,10 +170,17 @@ my @handle_tests = (
 
     {
         where => {
-            id  => [],
             bar => {'!=' => []},
         },
-        stmt => " WHERE ( 1=1 AND 0=1 )",
+        stmt => " WHERE ( 1=1 )",
+        bind => [],
+    },
+
+    {
+        where => {
+            id  => [],
+        },
+        stmt => " WHERE ( 0=1 )",
         bind => [],
     },
 
@@ -211,86 +218,6 @@ my @handle_tests = (
    },
 );
 
-# 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) {