X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FSQL%2FAbstract.pm;h=a07d89c31f086a25f393fc7c8308320bb943d060;hb=0a7639af83c66757087775fef8a0b557915c30d7;hp=e0c44dc9f5b73c0f5d734b1dc1c4c99113295a59;hpb=8499489fc91fa56f32297a564fdd361b4c577766;p=dbsrgits%2FSQL-Abstract.git

diff --git a/lib/SQL/Abstract.pm b/lib/SQL/Abstract.pm
index e0c44dc..a07d89c 100644
--- a/lib/SQL/Abstract.pm
+++ b/lib/SQL/Abstract.pm
@@ -574,8 +574,8 @@ sub _expand_expr {
         push(@res, $self->_expand_expr({ $el, shift(@expr) }));
       } elsif ($elref eq 'ARRAY') {
         push(@res, $self->_expand_expr($el)) if @$el;
-      } elsif (is_literal_value($el)) {
-        push @res, $el;
+      } elsif (my $l = is_literal_value($el)) {
+        push @res, { -literal => $l };
       } elsif ($elref eq 'HASH') {
         push @res, $self->_expand_expr($el);
       } else {
@@ -1096,46 +1096,6 @@ sub _where_unary_op {
   return ($sql, @bind);
 }
 
-sub _where_op_ANDOR {
-  my ($self, $op, $v) = @_;
-
-  $self->_SWITCH_refkind($v, {
-    ARRAYREF => sub {
-      return $self->_where_ARRAYREF($v, $op);
-    },
-
-    HASHREF => sub {
-      return ($op =~ /^or/i)
-        ? $self->_where_ARRAYREF([ map { $_ => $v->{$_} } (sort keys %$v) ], $op)
-        : $self->_where_HASHREF($v);
-    },
-
-    SCALARREF  => sub {
-      puke "-$op => \\\$scalar makes little sense, use " .
-        ($op =~ /^or/i
-          ? '[ \$scalar, \%rest_of_conditions ] instead'
-          : '-and => [ \$scalar, \%rest_of_conditions ] instead'
-        );
-    },
-
-    ARRAYREFREF => sub {
-      puke "-$op => \\[...] makes little sense, use " .
-        ($op =~ /^or/i
-          ? '[ \[...], \%rest_of_conditions ] instead'
-          : '-and => [ \[...], \%rest_of_conditions ] instead'
-        );
-    },
-
-    SCALAR => sub { # permissively interpreted as SQL
-      puke "-$op => \$value makes little sense, use -bool => \$value instead";
-    },
-
-    UNDEF => sub {
-      puke "-$op => undef not supported";
-    },
-   });
-}
-
 sub _where_op_NEST {
   my ($self, $op, $v) = @_;
 
@@ -1269,13 +1229,11 @@ my %special = (
       my ($lhs, $rhs) = @$args;
       my @in_bind;
       my @in_sql = map {
-        local $self->{_nested_func_lhs} = $lhs->{-ident}
-          if ref($lhs) eq 'HASH' and $lhs->{-ident};
-        my ($sql, @bind) = $self->_where_unary_op(%$_);
+        my ($sql, @bind) = $self->_render_expr($_);
         push @in_bind, @bind;
         $sql;
       } @$rhs;
-      my ($lhsql, @lbind) = $self->_recurse_where($lhs);
+      my ($lhsql, @lbind) = $self->_render_expr($lhs);
       return (
         $lhsql.' '.$self->_sqlcase($op).' ( '
         .join(', ', @in_sql)
@@ -1302,7 +1260,7 @@ sub _where_op_OP {
   }
   my $final_op = $op =~ /^(?:is|not)_/ ? join(' ', split '_', $op) : $op;
   if (@args == 1 and $op !~ /^(and|or)$/) {
-    my ($expr_sql, @bind) = $self->_recurse_where($args[0]);
+    my ($expr_sql, @bind) = $self->_render_expr($args[0]);
     my $op_sql = $self->_sqlcase($final_op);
     my $final_sql = (
       $unop_postfix{lc($final_op)}
@@ -1311,7 +1269,7 @@ sub _where_op_OP {
     );
     return (($op eq 'not' ? '('.$final_sql.')' : $final_sql), @bind);
   } else {
-     my @parts = map [ $self->_recurse_where($_) ], @args;
+     my @parts = map [ $self->_render_expr($_) ], @args;
      my ($final_sql) = map +($op =~ /^(and|or)$/ ? "(${_})" : $_), join(
        ' '.$self->_sqlcase($final_op).' ',
        map $_->[0], @parts
@@ -1332,7 +1290,7 @@ sub _where_op_FUNC {
     my @x = @$_;
     push @arg_sql, shift @x;
     @x
-  } map [ $self->_recurse_where($_) ], @args;
+  } map [ $self->_render_expr($_) ], @args;
   return ($self->_sqlcase($func).'('.join(', ', @arg_sql).')', @bind);
 }