X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F02where.t;h=50209d2629a0fba7c8929575fd307fac6f119158;hb=f7c0b41397ad20c5292ee2cb0f75277d86b5dc73;hp=b169de1421e4c1700a9c173c3afc2b90f490876d;hpb=474e33354b67e58e0bb4fa532adb3c01b148f36e;p=scpubgit%2FQ-Branch.git

diff --git a/t/02where.t b/t/02where.t
old mode 100644
new mode 100755
index b169de1..50209d2
--- 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
@@ -13,8 +14,7 @@ use SQL::Abstract;
 
 my $not_stringifiable = bless {}, 'SQLA::NotStringifiable';
 
-my@x=(
-);my @handle_tests = (
+my @handle_tests = (
     {
         where => {
             requestor => 'inna',
@@ -199,27 +199,103 @@ my@x=(
 
    {
        where => \[ 'foo = ?','bar' ],
-       stmt => " WHERE (foo = ?)", 
+       stmt => " WHERE (foo = ?)",
        bind => [ "bar" ],
    },
 
    {
        where => [ \[ 'foo = ?','bar' ] ],
-       stmt => " WHERE (foo = ?)", 
+       stmt => " WHERE (foo = ?)",
        bind => [ "bar" ],
    },
-);my@x2=(
 );
 
+# 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);
     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};
     });
 }