}
puke "Supplying an empty left hand side argument is not supported";
}
- $self->_assert_pass_injection_guard($k =~ /^-(.*)$/s) if $k =~ /^-/;
if ($k =~ /^-/) {
- if (my ($rest) = $k =~/^-not[_ ](.*)$/) {
- return +{ -op => [
- 'not',
- $self->_expand_expr({ "-${rest}", $v })
- ] };
- }
- {
- my $op = $k;
- $op =~ s/^-// if length($op) > 1;
-
- # top level special ops are illegal in general
- # note that, arguably, if it makes no sense at top level, it also
- # makes no sense on the other side of an = sign or similar but DBIC
- # gets disappointingly upset if I disallow it
- if (
- (our $Expand_Depth) == 1
- and List::Util::first { $op =~ $_->{regex} } @{$self->{special_ops}}
- ) {
- puke "Illegal use of top-level '-$op'"
- }
- if (my $us = List::Util::first { $op =~ $_->{regex} } @{$self->{unary_ops}}) {
- return { -op => [ $op, $v ] };
- }
- }
- if ($self->{render}{$k}) {
- return { $k => $v };
- }
- if (
- ref($v) eq 'HASH'
- and keys %$v == 1
- and (keys %$v)[0] =~ /^-/
- ) {
- my ($func) = $k =~ /^-(.*)$/;
- if (List::Util::first { $func =~ $_->{regex} } @{$self->{special_ops}}) {
- return +{ -op => [ $func, $self->_expand_expr($v) ] };
- }
- return +{ -func => [ $func, $self->_expand_expr($v) ] };
- }
- if (!ref($v) or is_literal_value($v)) {
- return +{ -op => [ $k =~ /^-(.*)$/, $self->_expand_expr($v) ] };
- }
+ return $self->_expand_expr_hashpair_op($k, $v);
}
+ return $self->_expand_expr_hashpair_ident($k, $v);
+}
+
+sub _expand_expr_hashpair_ident {
+ my ($self, $k, $v) = @_;
+
+ # undef needs to be re-sent with cmp to achieve IS/IS NOT NULL
+
if (
!defined($v)
or (
) {
return $self->_expand_expr({ $k => { $self->{cmp} => undef } });
}
+
+ my $ik = $self->_expand_ident(-ident => $k);
+
+ # scalars and objects get expanded as whatever requested or values
+
if (!ref($v) or Scalar::Util::blessed($v)) {
my $d = our $Default_Scalar_To;
- return +{
- -op => [
- $self->{cmp},
- $self->_expand_ident(-ident => $k),
- ($d
- ? $self->_expand_expr($d => $v)
- : { -bind => [ $k, $v ] }
- )
- ]
- };
+ local our $Cur_Col_Meta = $k;
+ return $self->_expand_expr_hashpair_ident(
+ $k,
+ ($d
+ ? $self->_expand_expr($d => $v)
+ : { -value => $v }
+ )
+ );
}
if (ref($v) eq 'HASH') {
if (keys %$v > 1) {
return $self->_expand_op_andor(-and => [
- map +{ $k => { $_ => $v->{$_} } },
+ map +{ $_ => $v->{$_} },
sort keys %$v
- ]);
+ ], $k);
}
return undef unless keys %$v;
my ($vk, $vv) = %$v;
my $op = join ' ', split '_', (map lc, $vk =~ /^-?(.*)$/)[0];
$self->_assert_pass_injection_guard($op);
if ($op =~ s/ [_\s]? \d+ $//x ) {
- belch 'Use of [and|or|nest]_N modifiers is deprecated and will be removed in SQLA v2.0. '
- . "You probably wanted ...-and => [ -$op => COND1, -$op => COND2 ... ]";
+ return $self->_expand_expr($k, $v);
}
if (my $x = $self->{expand_op}{$op}) {
local our $Cur_Col_Meta = $k;
return $self->$x($op, $vv, $k);
}
- if ($op eq 'value' and not defined($vv)) {
- return $self->_expand_expr({ $k, undef }) unless defined($vv);
- }
if ($op =~ /^is(?: not)?$/) {
puke "$op can only take undef as argument"
if defined($vv)
and exists($vv->{-value})
and !defined($vv->{-value})
);
- return +{ -op => [ $op.' null', $self->_expand_ident(-ident => $k) ] };
+ return +{ -op => [ $op.' null', $ik ] };
}
if (my $us = List::Util::first { $op =~ $_->{regex} } @{$self->{special_ops}}) {
- return { -op => [ $op, $self->_expand_ident(-ident => $k), $vv ] };
+ return { -op => [ $op, $ik, $vv ] };
}
if (my $us = List::Util::first { $op =~ $_->{regex} } @{$self->{unary_ops}}) {
return { -op => [
$self->{cmp},
- $self->_expand_ident(-ident => $k),
+ $ik,
{ -op => [ $op, $vv ] }
] };
}
: puke "operator '$op' applied on an empty array (field '$k')";
}
return $self->_expand_op_andor($logic => [
- map +{ $k => { $vk => $_ } },
+ map +{ $vk => $_ },
@values
- ]);
+ ], $k);
}
if (
!defined($vv)
: $op =~ $self->{inequality_op} ? 'is not'
: $op =~ $self->{not_like_op} ? belch("Supplying an undefined argument to '@{[ uc $op]}' is deprecated") && 'is not'
: puke "unexpected operator '$op' with undef operand";
- return +{ -op => [ $is.' null', $self->_expand_ident(-ident => $k) ] };
+ return +{ -op => [ $is.' null', $ik ] };
}
local our $Cur_Col_Meta = $k;
return +{ -op => [
$op,
- $self->_expand_ident(-ident => $k),
+ $ik,
$self->_expand_expr($vv)
] };
}
: '-'.lc($self->{logic} || 'OR')
);
return $self->_expand_op_andor(
- $logic => [ map +{ $k => $_ }, @$v ]
+ $logic => $v, $k
);
}
if (my $literal = is_literal_value($v)) {
die "notreached";
}
+sub _expand_expr_hashpair_op {
+ my ($self, $k, $v) = @_;
+
+ my $op = $k;
+ $op =~ s/^-// if length($op) > 1;
+ $self->_assert_pass_injection_guard($op);
+
+ # Ops prefixed with -not_ get converted
+
+ if (my ($rest) = $op =~/^not[_ ](.*)$/) {
+ return +{ -op => [
+ 'not',
+ $self->_expand_expr({ "-${rest}", $v })
+ ] };
+ }
+
+ # the old special op system requires illegality for top-level use
+
+ if (
+ (our $Expand_Depth) == 1
+ and List::Util::first { $op =~ $_->{regex} } @{$self->{special_ops}}
+ ) {
+ puke "Illegal use of top-level '-$op'"
+ }
+
+ # the old unary op system means we should touch nothing and let it work
+
+ if (my $us = List::Util::first { $op =~ $_->{regex} } @{$self->{unary_ops}}) {
+ return { -op => [ $op, $v ] };
+ }
+
+ # an explicit node type is currently assumed to be expanded (this is almost
+ # certainly wrong and there should be expansion anyway)
+
+ if ($self->{render}{$k}) {
+ return { $k => $v };
+ }
+
+ # hashref RHS values get expanded and used as op/func args
+
+ if (
+ ref($v) eq 'HASH'
+ and keys %$v == 1
+ and (keys %$v)[0] =~ /^-/
+ ) {
+ my ($func) = $k =~ /^-(.*)$/;
+ if (List::Util::first { $func =~ $_->{regex} } @{$self->{special_ops}}) {
+ return +{ -op => [ $func, $self->_expand_expr($v) ] };
+ }
+ return +{ -func => [ $func, $self->_expand_expr($v) ] };
+ }
+
+ # scalars and literals get simply expanded
+
+ if (!ref($v) or is_literal_value($v)) {
+ return +{ -op => [ $op, $self->_expand_expr($v) ] };
+ }
+
+ die "notreached";
+}
+
sub _expand_ident {
my ($self, $op, $body) = @_;
unless (defined($body) or (ref($body) and ref($body) eq 'ARRAY')) {
sub _expand_op_andor {
my ($self, $logic, $v, $k) = @_;
if (defined $k) {
- $v = [ map +{ $k, { $_ => $v->{$_} } },
- sort keys %$v ];
+ $v = [ map +{ $k, $_ },
+ (ref($v) eq 'HASH')
+ ? (map +{ $_ => $v->{$_} }, sort keys %$v)
+ : @$v,
+ ];
}
my ($logop) = $logic =~ /^-?(.*)$/;
if (ref($v) eq 'HASH') {
projects / dbsrgits/SQL-Abstract.git / blobdiff