Merge 'and_or' into 'trunk'

r5860@Thesaurus (orig r5859):  arcanez | 2009-04-07 18:37:24 +0200
 * branch to work on -and => [], -or => {}
r5862@Thesaurus (orig r5861):  arcanez | 2009-04-08 04:47:47 +0200
fix for hashref $logic
r5969@Thesaurus (orig r5968):  arcanez | 2009-04-24 00:03:03 +0200
readd the failing test back in
r5970@Thesaurus (orig r5969):  ribasushi | 2009-04-24 00:16:41 +0200
Strip some parenthesis for easier reading

diff --git a/lib/SQL/Abstract.pm b/lib/SQL/Abstract.pm
index f5bbf62..e93bca7 100644 (file)
--- a/lib/SQL/Abstract.pm
+++ b/lib/SQL/Abstract.pm
@@ -528,9 +528,10 @@ sub _where_hashpair_ARRAYREF {
 }
 
 sub _where_hashpair_HASHREF {
-  my ($self, $k, $v) = @_;
+  my ($self, $k, $v, $logic) = @_;
+  $logic ||= 'and';
 
-  my (@all_sql, @all_bind);
+  my ($all_sql, @all_bind);
 
   for my $op (sort keys %$v) {
     my $val = $v->{$op};
@@ -571,6 +572,10 @@ sub _where_hashpair_HASHREF {
           @bind = @sub_bind;
         },
 
+        HASHREF => sub {
+          ($sql, @bind) = $self->_where_hashpair_HASHREF($k, $val, $op);
+        },
+
         UNDEF => sub {          # CASE: col => {op => undef} : sql "IS (NOT)? NULL"
           my $is = ($op =~ $self->{equality_op})   ? 'is'     :
                    ($op =~ $self->{inequality_op}) ? 'is not' :
@@ -587,11 +592,10 @@ sub _where_hashpair_HASHREF {
       });
     }
 
-    push @all_sql, $sql;
+    ($all_sql) = (defined $all_sql and $all_sql) ? $self->_join_sql_clauses($logic, [$all_sql, $sql], []) : $sql;
     push @all_bind, @bind;
   }
-
-  return $self->_join_sql_clauses('and', \@all_sql, \@all_bind);
+  return ($all_sql, @all_bind);
 }
 
 

diff --git a/t/04modifiers.t b/t/04modifiers.t
index 1d73dff..b365443 100644 (file)
--- a/t/04modifiers.t
+++ b/t/04modifiers.t
@@ -145,7 +145,6 @@ my @and_or_tests = (
   },
   # test column multi-cond in arrayref (even more useful)
   {
-#    todo => 'Clarify semantics in 1.52',
     where => { x => { '!=' => [ -and => (1 .. 3) ] } },
     stmt => 'WHERE x != ? AND x != ? AND x != ?',
     bind => [1..3],
@@ -153,12 +152,11 @@ my @and_or_tests = (
 
   # the -or should affect only the inner hashref, as we are not in an outer arrayref
   {
-#    todo => 'Clarify semantics in 1.52',
     where => { x => {
       -or => { '!=', 1, '>=', 2 }, -like => 'x%'
     }},
-    stmt => 'WHERE (x != ? OR x >= ?) AND x LIKE ?',
-    bind => [qw/1 2 x%/],
+    stmt => 'WHERE x LIKE ? AND ( x != ? OR x >= ? )',
+    bind => [qw/x% 1 2/],
   },
 
   # the -and should affect the OUTER arrayref, while the internal structures remain intact