From: Ash Berlin <ash_github@firemirror.com>
Date: Wed, 7 Feb 2007 15:09:40 +0000 (+0000)
Subject: added patch from Guillermo to cleanup in/between,
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=61fdf29c52aedd498ffb640f3e452c428ce69b42;p=scpubgit%2FQ-Branch.git

added patch from Guillermo to cleanup in/between,
and added some text about mst = maintainer
r2296@metis (orig r18):  nwiger | 2007-01-08 18:43:37 +0000
---

diff --git a/lib/SQL/Abstract.pm b/lib/SQL/Abstract.pm
index c42653c..a0c6b4a 100644
--- a/lib/SQL/Abstract.pm
+++ b/lib/SQL/Abstract.pm
@@ -648,6 +648,7 @@ sub _recurse_where {
         for my $k (sort keys %$where) {
             my $v = $where->{$k};
             my $label = $self->_quote($k);
+
             if ($k =~ /^-(\D+)/) {
                 # special nesting, like -and, -or, -nest, so shift over
                 my $subjoin = $self->_modlogic($1);
@@ -683,6 +684,10 @@ sub _recurse_where {
                 # modified operator { '!=', 'completed' }
                 for my $f (sort keys %$v) {
                     my $x = $v->{$f};
+
+                    # do the right thing for single -in values
+                    $x = [$x] if ($f =~ /^-?\s*(not[\s_]+)?in\s*$/i  &&  ref $x ne 'ARRAY');
+
                     $self->_debug("HASH($k) means modified operator: { $f }");
 
                     # check for the operator being "IN" or "BETWEEN" or whatever
@@ -692,12 +697,19 @@ sub _recurse_where {
                               $self->_debug("HASH($f => $x) uses special operator: [ $u ]");
                               if ($u =~ /between/i) {
                                   # SQL sucks
+                                  # Throw an exception if you try to use between with
+                                  # anything other than 2 values
+                                  $self->puke("You need two values to use between") unless @$x == 2;
                                   push @sqlf, join ' ', $self->_convert($label), $u, $self->_convert('?'),
                                                         $self->_sqlcase('and'), $self->_convert('?');
-                              } else {
+                              } elsif (@$x) {
+                                  # DWIM for empty arrayrefs
                                   push @sqlf, join ' ', $self->_convert($label), $u, '(',
                                                   join(', ', map { $self->_convert('?') } @$x),
                                               ')';
+                              } elsif(@$x == 0){
+                                  # Empty IN defaults to 0=1 and empty NOT IN to 1=1
+                                  push(@sqlf, ($u =~ /not/i ? "1=1" : "0=1"));
                               }
                               push @sqlv, $self->_bindtype($k, @$x);
                           } else {