Correct nested modifier tests

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

diff --git a/t/02where.t b/t/02where.t
old mode 100644 (file)
new mode 100755 (executable)
index 87ce1c2..39d620e
--- a/t/02where.t
+++ b/t/02where.t
@@ -6,6 +6,7 @@ use Test::More;
 use Test::Exception;
 use SQL::Abstract::Test import => ['is_same_sql_bind'];
 
+use Data::Dumper;
 use SQL::Abstract;
 
 # Make sure to test the examples, since having them break is somewhat
@@ -184,7 +185,6 @@ my @handle_tests = (
         stmt => " WHERE ( (bar > ? AND bar < ?) AND foo IN (?, ?) )",
         bind => [44, 55, 22, 33],
     },
-
    {
        where => { -and => [{}, { 'me.id' => '1'}] },
        stmt => " WHERE ( ( me.id = ? ) )",
@@ -198,28 +198,108 @@ my @handle_tests = (
    },
 
    {
-       where => \[ 'foo ?','bar' ],
-       stmt => " WHERE (foo = ?)", 
+       where => \[ 'foo = ?','bar' ],
+       stmt => " WHERE (foo = ?)",
        bind => [ "bar" ],
    },
 
    {
-       where => [ \[ 'foo ?','bar' ] ],
-       stmt => " WHERE (foo = ?)", 
+       where => [ \[ 'foo = ?','bar' ] ],
+       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/],
+};
+
+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) {
+    local $Data::Dumper::Terse = 1;
     my $sql = SQL::Abstract->new;
     my($stmt, @bind);
     lives_ok (sub { 
       ($stmt, @bind) = $sql->where($case->{where}, $case->{order});
-      is_same_sql_bind($stmt, \@bind, $case->{stmt}, $case->{bind});
+      is_same_sql_bind($stmt, \@bind, $case->{stmt}, $case->{bind})
+        || diag "Search term:\n" . Dumper $case->{where};
     });
 }