$opt{expand_unary} = {};
$opt{expand} = {
- -ident => '_expand_ident',
- -value => '_expand_value',
-not => '_expand_not',
-bool => '_expand_bool',
- -and => '_expand_andor',
- -or => '_expand_andor',
+ -and => '_expand_op_andor',
+ -or => '_expand_op_andor',
-nest => '_expand_nest',
};
'not between' => '_expand_between',
'in' => '_expand_in',
'not in' => '_expand_in',
- (map +($_ => sub {
- my ($self, $op, $arg, $k) = @_;
- return +{ -op => [
- $self->{cmp},
- $self->_expand_ident(-ident => $k),
- $self->_expand_expr({ '-'.$op => $arg }),
- ] };
- }), qw(ident value)),
'nest' => '_expand_nest',
+ (map +($_ => '_expand_op_andor'),
+ qw(and or)),
};
+ # placeholder for _expand_unop system
+ {
+ my %unops = (-ident => '_expand_ident', -value => '_expand_value');
+ foreach my $name (keys %unops) {
+ $opt{expand}{$name} = $unops{$name};
+ my ($op) = $name =~ /^-(.*)$/;
+ $opt{expand_op}{$op} = sub {
+ my ($self, $op, $arg, $k) = @_;
+ return +{ -op => [
+ $self->{cmp},
+ $self->_expand_ident(-ident => $k),
+ $self->_expand_expr({ '-'.$op => $arg }),
+ ] };
+ };
+ }
+ }
+
$opt{render} = {
(map +("-$_", "_render_$_"), qw(op func bind ident literal list)),
%{$opt{render}||{}}
if (ref($expr) eq 'HASH') {
return undef unless my $kc = keys %$expr;
if ($kc > 1) {
- return $self->_expand_andor(-and => $expr);
+ return $self->_expand_op_andor(-and => $expr);
}
my ($key, $value) = %$expr;
if ($key =~ /^-/ and $key =~ s/ [_\s]? \d+ $//x ) {
}
if (ref($expr) eq 'ARRAY') {
my $logic = '-'.lc($self->{logic});
- return $self->_expand_andor($logic, $expr);
+ return $self->_expand_op_andor($logic, $expr);
}
if (my $literal = is_literal_value($expr)) {
return +{ -literal => $literal };
}
if (ref($v) eq 'HASH') {
if (keys %$v > 1) {
- return $self->_expand_andor(-and => [
+ return $self->_expand_op_andor(-and => [
map +{ $k => { $_ => $v->{$_} } },
sort keys %$v
]);
);
return +{ -op => [ $op.' null', $self->_expand_ident(-ident => $k) ] };
}
- if ($op =~ /^(and|or)$/) {
- return $self->_expand_andor('-'.$op, [
- map +{ $k, { $_ => $vv->{$_} } },
- sort keys %$vv
- ]);
- }
if (my $us = List::Util::first { $op =~ $_->{regex} } @{$self->{special_ops}}) {
return { -op => [ $op, $self->_expand_ident(-ident => $k), $vv ] };
}
: $op =~ $self->{not_like_op} ? belch("Supplying an empty arrayref to '@{[ uc $op]}' is deprecated") && $self->sqltrue
: puke "operator '$op' applied on an empty array (field '$k')";
}
- return $self->_expand_andor($logic => [
+ return $self->_expand_op_andor($logic => [
map +{ $k => { $vk => $_ } },
@values
]);
? shift(@{$v = [ @$v ]})
: '-'.lc($self->{logic} || 'OR')
);
- return $self->_expand_andor(
+ return $self->_expand_op_andor(
$logic => [ map +{ $k => $_ }, @$v ]
);
}
return $self->_expand_ident(-ident => $v);
}
-sub _expand_andor {
- my ($self, $k, $v) = @_;
- my ($logop) = $k =~ /^-(.*)$/;
+sub _expand_op_andor {
+ my ($self, $logic, $v, $k) = @_;
+ if (defined $k) {
+ $v = [ map +{ $k, { $_ => $v->{$_} } },
+ sort keys %$v ];
+ }
+ my ($logop) = $logic =~ /^-?(.*)$/;
if (ref($v) eq 'HASH') {
return +{ -op => [
$logop,
- map $self->_expand_expr({ $_ => $v->{$_} }, $logop),
+ map $self->_expand_expr({ $_ => $v->{$_} }),
sort keys %$v
] };
}