X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F02where.t;h=6d89b8c5a2bbde7c8dd5a8c7775d58f0d5a1afa2;hb=3cdadcbe32e98b018af5bca2d8270b13d2d2a77a;hp=50209d2629a0fba7c8929575fd307fac6f119158;hpb=f7c0b41397ad20c5292ee2cb0f75277d86b5dc73;p=dbsrgits%2FSQL-Abstract.git

diff --git a/t/02where.t b/t/02where.t
old mode 100755
new mode 100644
index 50209d2..6d89b8c
--- a/t/02where.t
+++ b/t/02where.t
@@ -1,17 +1,11 @@
-#!/usr/bin/perl
-
 use strict;
 use warnings;
 use Test::More;
-use Test::Exception;
-use SQL::Abstract::Test import => ['is_same_sql_bind'];
+use Test::Warn;
+use SQL::Abstract::Test import => [qw(is_same_sql_bind diag_where) ];
 
-use Data::Dumper;
 use SQL::Abstract;
 
-# Make sure to test the examples, since having them break is somewhat
-# embarrassing. :-(
-
 my $not_stringifiable = bless {}, 'SQLA::NotStringifiable';
 
 my @handle_tests = (
@@ -82,9 +76,7 @@ my @handle_tests = (
             completion_date => { 'between', ['2002-10-01', '2003-02-06'] },
         },
         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",
+        stmt => "WHERE ( ( completion_date BETWEEN ? AND ? ) AND status = ? ) ORDER BY ticket, requestor",
         bind => [qw/2002-10-01 2003-02-06 completed/],
     },
 
@@ -105,7 +97,7 @@ my @handle_tests = (
     },
 
     {
-        where => {  
+        where => {
             priority  => [ {'>', 3}, {'<', 1} ],
             requestor => \'is not null',
         },
@@ -115,9 +107,17 @@ my @handle_tests = (
     },
 
     {
-        where => {  
+        where => {
+            requestor => { '!=', ['-and', undef, ''] },
+        },
+        stmt => " WHERE ( requestor IS NOT NULL AND requestor != ? )",
+        bind => [''],
+    },
+
+    {
+        where => {
             priority  => [ {'>', 3}, {'<', 1} ],
-            requestor => { '!=', undef }, 
+            requestor => { '!=', undef },
         },
         order => [qw/a b c d e f g/],
         stmt => " WHERE ( ( ( priority > ? ) OR ( priority < ? ) ) AND requestor IS NOT NULL )"
@@ -126,28 +126,25 @@ my @handle_tests = (
     },
 
     {
-        where => {  
+        where => {
             priority  => { 'between', [1, 3] },
-            requestor => { 'like', undef }, 
+            requestor => { 'like', undef },
         },
         order => \'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/],
+        warns => qr/Supplying an undefined argument to 'LIKE' is deprecated/,
     },
 
 
     {
-        where => {  
-            id  => 1,
-	    num => {
-	     '<=' => 20,
-	     '>'  => 10,
-	    },
+        where => {
+          id  => 1,
+          num => {
+           '<=' => 20,
+           '>'  => 10,
+          },
         },
-# 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/],
     },
@@ -160,19 +157,24 @@ 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'],
+        warns => qr/\QA multi-element arrayref as an argument to the inequality op 'NOT LIKE' is technically equivalent to an always-true 1=1/,
     },
 
     {
         where => {
-            id  => [],
             bar => {'!=' => []},
         },
-        stmt => " WHERE ( 1=1 AND 0=1 )",
+        stmt => " WHERE ( 1=1 )",
+        bind => [],
+    },
+
+    {
+        where => {
+            id  => [],
+        },
+        stmt => " WHERE ( 0=1 )",
         bind => [],
     },
 
@@ -185,6 +187,24 @@ my @handle_tests = (
         stmt => " WHERE ( (bar > ? AND bar < ?) AND foo IN (?, ?) )",
         bind => [44, 55, 22, 33],
     },
+
+    {
+        where => {
+          -and => [
+            user => 'nwiger',
+            [
+              -and => [ workhrs => {'>', 20}, geo => 'ASIA' ],
+              -or => { workhrs => {'<', 50}, geo => 'EURO' },
+            ],
+          ],
+        },
+        stmt => "WHERE ( user = ? AND (
+               ( workhrs > ? AND geo = ? )
+            OR ( geo = ? OR workhrs < ? )
+          ) )",
+        bind => [qw/nwiger 20 ASIA EURO 50/],
+    },
+
    {
        where => { -and => [{}, { 'me.id' => '1'}] },
        stmt => " WHERE ( ( me.id = ? ) )",
@@ -208,98 +228,175 @@ my @handle_tests = (
        stmt => " WHERE (foo = ?)",
        bind => [ "bar" ],
    },
-);
 
-# 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 => { -bool => \'function(x)' },
+       stmt => " WHERE function(x)",
+       bind => [],
    },
+
    {
-      where => { -and => [
-        [ foo => 1, bar => 2 ],
-        baz => 3,
-      ]},
-      %$mod_and,
+       where => { -bool => 'foo' },
+       stmt => " WHERE foo",
+       bind => [],
    },
 
-   # test modifiers within arrayrefs
    {
-      where => [ -or => [
-        [ foo => 1, bar => 2 ],
-        baz => 3,
-      ]],
-      %$mod_or,
+       where => { -and => [-bool => 'foo', -bool => 'bar'] },
+       stmt => " WHERE foo AND bar",
+       bind => [],
    },
+
    {
-      where => [ -and => [
-        [ foo => 1, bar => 2 ],
-        baz => 3,
-      ]],
-      %$mod_and,
+       where => { -or => [-bool => 'foo', -bool => 'bar'] },
+       stmt => " WHERE foo OR bar",
+       bind => [],
    },
 
-   # test conflicting modifiers within hashrefs (last one should win?)
    {
-      where => { -and => [ -or =>
-        [ foo => 1, bar => 2 ],
-        baz => 3,
-      ]},
-      %$mod_or,
+       where => { -not_bool => \'function(x)' },
+       stmt => " WHERE NOT function(x)",
+       bind => [],
    },
+
    {
-      where => { -or => [ -and =>
-        [ foo => 1, bar => 2 ],
-        baz => 3,
-      ]},
-      %$mod_and,
+       where => { -not_bool => 'foo' },
+       stmt => " WHERE NOT foo",
+       bind => [],
    },
 
-   # test conflicting modifiers within arrayrefs (last one should win?)
    {
-      where => [ -and => [ -or =>
-        [ foo => 1, bar => 2 ],
-        baz => 3,
-      ]],
-      %$mod_or,
+       where => { -and => [-not_bool => 'foo', -not_bool => 'bar'] },
+       stmt => " WHERE (NOT foo) AND (NOT bar)",
+       bind => [],
    },
+
    {
-      where => [ -or => [ -and =>
-        [ foo => 1, bar => 2 ],
-        baz => 3,
-      ]],
-      %$mod_and,
+       where => { -or => [-not_bool => 'foo', -not_bool => 'bar'] },
+       stmt => " WHERE (NOT foo) OR (NOT bar)",
+       bind => [],
    },
-);
 
-plan tests => ( @handle_tests * 2 ) + 1;
+   {
+       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 => { '!=' => { -trunc => { -year => \'sysdate' } } } },
+       stmt => " WHERE ( timestamp != TRUNC (YEAR sysdate) )",
+       bind => [],
+   },
+   {
+       where => { timestamp => { '>=' => { -to_date => '2009-12-21 00:00:00' } } },
+       stmt => " WHERE ( timestamp >= TO_DATE ? )",
+       bind => ['2009-12-21 00:00:00'],
+   },
+
+# Legacy function specs
+   {
+       where => { ip => {'<<=' => '127.0.0.1/32' } },
+       stmt => "WHERE ( ip <<= ? )",
+       bind => ['127.0.0.1/32'],
+   },
+   {
+       where => { foo => { 'GLOB' => '*str*' } },
+       stmt => " WHERE foo GLOB ? ",
+       bind => [ '*str*' ],
+   },
+   {
+       where => { foo => { 'REGEXP' => 'bar|baz' } },
+       stmt => " WHERE foo REGEXP ? ",
+       bind => [ 'bar|baz' ],
+   },
+
+# Tests for -not
+# Basic tests only
+    {
+        where => { -not => { a => 1 } },
+        stmt  => " WHERE ( (NOT a = ?) ) ",
+        bind => [ 1 ],
+    },
+    {
+        where => { a => 1, -not => { b => 2 } },
+        stmt  => " WHERE ( ( (NOT b = ?) AND a = ? ) ) ",
+        bind => [ 2, 1 ],
+    },
+    {
+        where => { -not => { a => 1, b => 2, c => 3 } },
+        stmt  => " WHERE ( (NOT ( a = ? AND b = ? AND c = ? )) ) ",
+        bind => [ 1, 2, 3 ],
+    },
+    {
+        where => { -not => [ a => 1, b => 2, c => 3 ] },
+        stmt  => " WHERE ( (NOT ( a = ? OR b = ? OR c = ? )) ) ",
+        bind => [ 1, 2, 3 ],
+    },
+    {
+        where => { -not => { c => 3, -not => { b => 2, -not => { a => 1 } } } },
+        stmt  => " WHERE ( (NOT ( (NOT ( (NOT a = ?) AND b = ? )) AND c = ? )) ) ",
+        bind => [ 1, 2, 3 ],
+    },
+    {
+        where => { -not => { -bool => 'c', -not => { -not_bool => 'b', -not => { a => 1 } } } },
+        stmt  => " WHERE ( (NOT ( c AND (NOT ( (NOT a = ?) AND (NOT b) )) )) ) ",
+        bind => [ 1 ],
+    },
+);
 
 for my $case (@handle_tests) {
-    local $Data::Dumper::Terse = 1;
     my $sql = SQL::Abstract->new;
-    my($stmt, @bind);
-    lives_ok (sub { 
+    my ($stmt, @bind);
+    warnings_exist {
       ($stmt, @bind) = $sql->where($case->{where}, $case->{order});
-      is_same_sql_bind($stmt, \@bind, $case->{stmt}, $case->{bind})
-        || diag "Search term:\n" . Dumper $case->{where};
-    });
+    } $case->{warns} || [];
+
+    is_same_sql_bind($stmt, \@bind, $case->{stmt}, $case->{bind})
+      || diag_where ( $case->{where} );
 }
 
-dies_ok {
-    my $sql = SQL::Abstract->new;
-    $sql->where({ foo => { '>=' => [] }},);
-};
+done_testing;