From: Peter Rabbitson <ribasushi@cpan.org>
Date: Sun, 22 Mar 2009 22:26:12 +0000 (+0000)
Subject: Preliminary fix by arcanez
X-Git-Tag: v1.70~200
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=f67591bf9db5f1514f1abf4ca86a18c3343788b4;p=dbsrgits%2FSQL-Abstract.git

Preliminary fix by arcanez
---

diff --git a/lib/SQL/Abstract.pm b/lib/SQL/Abstract.pm
index c282c27..8e46156 100644
--- a/lib/SQL/Abstract.pm
+++ b/lib/SQL/Abstract.pm
@@ -367,17 +367,7 @@ sub _where_ARRAYREF {
 
   my @clauses = @$where;
 
-  # if the array starts with [-and|or => ...], recurse with that logic
-  my $first   = $clauses[0] || '';
-  if ($first =~ /^-(and|or)/i) {
-    $logic = $1;
-    shift @clauses;
-    return $self->_where_ARRAYREF(\@clauses, $logic);
-  }
-
-  #otherwise..
   my (@sql_clauses, @all_bind);
-
   # need to use while() so can shift() for pairs
   while (my $el = shift @clauses) { 
 
@@ -518,8 +508,9 @@ sub _where_hashpair_ARRAYREF {
 
     my @distributed = map { {$k =>  $_} } @v;
     unshift @distributed, $op if $op;
+    my $logic = $op ? substr($op, 1) : '';
 
-    return $self->_recurse_where(\@distributed);
+    return $self->_recurse_where(\@distributed, $logic);
   } 
   else {
     # LDNOTE : not sure of this one. What does "distribute over nothing" mean?