switch update to using _render_expr

[dbsrgits/SQL-Abstract.git] / lib / SQL / Abstract.pm

diff --git a/lib/SQL/Abstract.pm b/lib/SQL/Abstract.pm
index f209eaf..dc21ce0 100644 (file)
--- a/lib/SQL/Abstract.pm
+++ b/lib/SQL/Abstract.pm
@@ -433,8 +433,10 @@ sub _update_set_values {
         puke 'Operator calls in update must be in the form { -op => $arg }'
           if (@rest or not $op =~ /^\-(.+)/);
 
-        local $self->{_nested_func_lhs} = $k;
-        my ($sql, @bind) = $self->_where_unary_op($1, $arg);
+        local our $Cur_Col_Meta = $k;
+        my ($sql, @bind) = $self->_render_expr(
+          $self->_expand_expr_hashpair($op, $arg)
+        );
 
         push @set, "$label = $sql";
         push @all_bind, @bind;
@@ -1096,46 +1098,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) = @_;
 
@@ -1248,14 +1210,12 @@ my %special = (
             unless $low->{-literal};
           @{$low->{-literal}}
         } else {
-          local $self->{_nested_func_lhs} = $left->{-ident}
-            if ref($left) eq 'HASH' and $left->{-ident};
-          my ($l, $h) = map [ $self->_where_unary_op(%$_) ], $low, $high;
+          my ($l, $h) = map [ $self->_render_expr($_) ], $low, $high;
           (join(' ', $l->[0], $self->_sqlcase('and'), $h->[0]),
            @{$l}[1..$#$l], @{$h}[1..$#$h])
         }
       };
-      my ($lhsql, @lhbind) = $self->_recurse_where($left);
+      my ($lhsql, @lhbind) = $self->_render_expr($left);
       return (
         join(' ', '(', $lhsql, $self->_sqlcase($op), $rhsql, ')'),
         @lhbind, @rhbind
@@ -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)
@@ -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);
 }