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 {
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) = @_;
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)
}
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)}
);
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
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);
}