Port whitespace cleanup from master 428975b0

[dbsrgits/SQL-Abstract.git] / t / 02where.t

diff --git a/t/02where.t b/t/02where.t
index 5fea555..9ea045b 100644 (file)
--- a/t/02where.t
+++ b/t/02where.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 use Test::More;
-use Test::Exception;
+use Test::Fatal;
 use SQL::Abstract::Test import => ['is_same_sql_bind'];
 
 use Data::Dumper;
@@ -106,7 +106,7 @@ my @handle_tests = (
     },
 
     {
-        where => {  
+        where => {
             priority  => [ {'>', 3}, {'<', 1} ],
             requestor => \'is not null',
         },
@@ -116,7 +116,7 @@ my @handle_tests = (
     },
 
     {
-        where => {  
+        where => {
             requestor => { '!=', ['-and', undef, ''] },
         },
         stmt => " WHERE ( requestor IS NOT NULL AND requestor != ? )",
@@ -124,9 +124,9 @@ my @handle_tests = (
     },
 
     {
-        where => {  
+        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 )"
@@ -135,9 +135,9 @@ my @handle_tests = (
     },
 
     {
-        where => {  
+        where => {
             priority  => { 'between', [1, 3] },
-            requestor => { 'like', undef }, 
+            requestor => { 'like', undef },
         },
         order => \'requestor, ticket',
 #LDNOTE: modified parentheses
@@ -149,12 +149,12 @@ my @handle_tests = (
 
 
     {
-        where => {  
-            id  => 1,
-           num => {
-            '<=' => 20,
-            '>'  => 10,
-           },
+        where => {
+          id  => 1,
+          num => {
+           '<=' => 20,
+           '>'  => 10,
+          },
         },
 # LDNOTE : modified test below, just parentheses differ
 #
@@ -201,6 +201,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 = ? ) )",
@@ -329,7 +347,7 @@ my @handle_tests = (
    },
    {
        where => { timestamp => { '>=' => { -to_date => '2009-12-21 00:00:00' } } },
-       stmt => " WHERE ( timestamp >= TO_DATE ? )",
+       stmt => " WHERE ( timestamp >= TO_DATE(?) )",
        bind => ['2009-12-21 00:00:00'],
    },
 
@@ -384,20 +402,18 @@ my @handle_tests = (
     },
 );
 
-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 { 
+    ok(!(my $e = exception {
       ($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};
-    });
+    }));
+    if ($e) {
+       fail "Died: $e: Search term:\n" . Dumper $case->{where};
+    }
 }
 
-dies_ok {
-    my $sql = SQL::Abstract->new;
-    $sql->where({ foo => { '>=' => [] }},);
-};
+done_testing;