Failing nested modifier tests (the tests themselves are debatable - possible regressi...

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

diff --git a/t/02where.t b/t/02where.t
old mode 100644 (file)
new mode 100755 (executable)
index b279651..50209d2
--- a/t/02where.t
+++ b/t/02where.t
@@ -4,18 +4,16 @@ use strict;
 use warnings;
 use Test::More;
 use Test::Exception;
+use SQL::Abstract::Test import => ['is_same_sql_bind'];
 
-use FindBin;
-use lib "$FindBin::Bin";
-use TestSqlAbstract;
-
-plan tests => 15;
-
+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 = (
     {
         where => {
@@ -30,6 +28,15 @@ my @handle_tests = (
     },
 
     {
+        where  => [
+            status => 'completed',
+            user   => 'nwiger',
+        ],
+        stmt => " WHERE ( status = ? OR user = ? )",
+        bind => [qw/completed nwiger/],
+    },
+
+    {
         where  => {
             user   => 'nwiger',
             status => 'completed'
@@ -178,16 +185,121 @@ 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 = ? ) )",
+       bind => [ 1 ],
+   },
+
+   {
+       where => { foo => $not_stringifiable, },
+       stmt => " WHERE ( foo = ? )",
+       bind => [ $not_stringifiable ],
+   },
 
+   {
+       where => \[ 'foo = ?','bar' ],
+       stmt => " WHERE (foo = ?)",
+       bind => [ "bar" ],
+   },
+
+   {
+       where => [ \[ 'foo = ?','bar' ] ],
+       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 => { -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) {
+    local $Data::Dumper::Terse = 1;
     my $sql = SQL::Abstract->new;
-    my($stmt, @bind) = $sql->where($case->{where}, $case->{order});
-    is_same_sql_bind($stmt, \@bind, $case->{stmt}, $case->{bind})
+    my($stmt, @bind);
+    lives_ok (sub { 
+      ($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};
+    });
 }
 
 dies_ok {
     my $sql = SQL::Abstract->new;
     $sql->where({ foo => { '>=' => [] }},);
-}
+};