$opt{expand_unary} = {};
+ $opt{expand} = {
+ -ident => '_expand_ident',
+ -value => '_expand_value',
+ -not => '_expand_not',
+ -bool => '_expand_bool',
+ -and => '_expand_andor',
+ -or => '_expand_andor',
+ };
+
return bless \%opt, $class;
}
map {
my ($k, $set) = @$_;
$set = { -bind => $_ } unless defined $set;
- +{ -op => [ '=', { -ident => $k }, $set ] };
+ +{ -op => [ '=', $self->_expand_ident(-ident => $k), $set ] };
}
map {
my $k = $_;
sub expand_expr {
my ($self, $expr, $default_scalar_to) = @_;
local our $Default_Scalar_To = $default_scalar_to if $default_scalar_to;
- $self->_expand_expr($expr, undef);
+ $self->_expand_expr($expr);
}
sub render_aqt {
die "notreached: $k";
}
+sub render_expr {
+ my ($self, $expr) = @_;
+ $self->render_aqt($self->expand_expr($expr));
+}
+
sub _expand_expr {
- my ($self, $expr, $logic, $default_scalar_to) = @_;
- local our $Default_Scalar_To = $default_scalar_to if $default_scalar_to;
+ my ($self, $expr, $logic) = @_;
our $Expand_Depth ||= 0; local $Expand_Depth = $Expand_Depth + 1;
return undef unless defined($expr);
if (ref($expr) eq 'HASH') {
- if (keys %$expr > 1) {
+ return undef unless my $kc = keys %$expr;
+ if ($kc > 1) {
$logic ||= 'and';
- return +{ -op => [
- $logic,
- map $self->_expand_expr_hashpair($_ => $expr->{$_}, $logic),
- sort keys %$expr
- ] };
+ return $self->_expand_andor("-${logic}", $expr);
+ }
+ my ($key, $value) = %$expr;
+ if ($key =~ /^-/ and $key =~ 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 => [ $key => COND1, $key => COND2 ... ]";
}
- return undef unless keys %$expr;
- return $self->_expand_expr_hashpair(%$expr, $logic);
+ if (my $exp = $self->{expand}{$key}) {
+ return $self->$exp($key, $value);
+ }
+ return $self->_expand_expr_hashpair($key, $value, $logic);
}
if (ref($expr) eq 'ARRAY') {
my $logic = lc($logic || $self->{logic});
- $logic eq 'and' or $logic eq 'or' or puke "unknown logic: $logic";
-
- my @expr = grep {
- (ref($_) eq 'ARRAY' and @$_)
- or (ref($_) eq 'HASH' and %$_)
- or 1
- } @$expr;
-
- my @res;
-
- while (my ($el) = splice @expr, 0, 1) {
- puke "Supplying an empty left hand side argument is not supported in array-pairs"
- unless defined($el) and length($el);
- my $elref = ref($el);
- if (!$elref) {
- local $Expand_Depth = 0;
- push(@res, grep defined, $self->_expand_expr({ $el, shift(@expr) }));
- } elsif ($elref eq 'ARRAY') {
- push(@res, grep defined, $self->_expand_expr($el)) if @$el;
- } elsif (my $l = is_literal_value($el)) {
- push @res, { -literal => $l };
- } elsif ($elref eq 'HASH') {
- local $Expand_Depth = 0;
- push @res, grep defined, $self->_expand_expr($el) if %$el;
- } else {
- die "notreached";
- }
- }
- return { -op => [ $logic, @res ] };
+ return $self->_expand_andor("-${logic}", $expr);
}
if (my $literal = is_literal_value($expr)) {
return +{ -literal => $literal };
}
if (!ref($expr) or Scalar::Util::blessed($expr)) {
- if (my $d = $Default_Scalar_To) {
+ if (my $d = our $Default_Scalar_To) {
return $self->_expand_expr({ $d => $expr });
}
if (my $m = our $Cur_Col_Meta) {
}
if ($k =~ /^-/) {
$self->_assert_pass_injection_guard($k =~ /^-(.*)$/s);
- if ($k =~ 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 => [ $k => COND1, $k => COND2 ... ]";
- }
if ($k eq '-nest') {
# DBIx::Class requires a nest warning to be emitted once but the private
# method it overrode to do so no longer exists
}
return $self->_expand_expr($v);
}
- if ($k eq '-bool') {
- if (ref($v)) {
- return $self->_expand_expr($v);
- }
- puke "-bool => undef not supported" unless defined($v);
- return { -ident => $v };
- }
- if ($k eq '-not') {
- return { -op => [ 'not', $self->_expand_expr($v) ] };
- }
if (my ($rest) = $k =~/^-not[_ ](.*)$/) {
return +{ -op => [
'not',
- $self->_expand_expr_hashpair("-${rest}", $v, $logic)
+ $self->_expand_expr({ "-${rest}", $v }, $logic)
] };
}
- if (my ($logic) = $k =~ /^-(and|or)$/i) {
- if (ref($v) eq 'HASH') {
- return $self->_expand_expr($v, $logic);
- }
- if (ref($v) eq 'ARRAY') {
- return $self->_expand_expr($v, $logic);
- }
- }
{
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
return { -op => [ $op, $v ] };
}
}
- if ($k eq '-value') {
- return +{ -bind => [ our $Cur_Col_Meta, $v ] };
- }
- if (my $custom = $self->{expand_unary}{$k}) {
- return $self->$custom($v);
- }
if ($self->{render}{$k}) {
return { $k => $v };
}
and not defined $v->{-value}
)
) {
- return $self->_expand_expr_hashpair($k => { $self->{cmp} => undef });
+ return $self->_expand_expr({ $k => { $self->{cmp} => undef } });
}
if (!ref($v) or Scalar::Util::blessed($v)) {
my $d = our $Default_Scalar_To;
return +{
-op => [
$self->{cmp},
- { -ident => $k },
- ($d ? { $d => $v } : { -bind => [ $k, $v ] })
+ $self->_expand_ident(-ident => $k),
+ ($d
+ ? $self->_expand_expr($d => $v)
+ : { -bind => [ $k, $v ] }
+ )
]
};
}
if (keys %$v > 1) {
return { -op => [
'and',
- map $self->_expand_expr_hashpair($k => { $_ => $v->{$_} }),
+ map $self->_expand_expr({ $k => { $_ => $v->{$_} } }),
sort keys %$v
] };
}
return undef unless keys %$v;
my ($vk, $vv) = %$v;
- $vk =~ s/^-//;
- $vk = lc($vk);
- $self->_assert_pass_injection_guard($vk);
- if ($vk =~ s/ [_\s]? \d+ $//x ) {
+ 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 => [ -$vk => COND1, -$vk => COND2 ... ]";
+ . "You probably wanted ...-and => [ -$op => COND1, -$op => COND2 ... ]";
}
- if ($vk =~ /^(?:not[ _])?between$/) {
+ if ($op =~ /^(?:not )?between$/) {
local our $Cur_Col_Meta = $k;
my @rhs = map $self->_expand_expr($_),
ref($vv) eq 'ARRAY' ? @$vv : $vv;
or
(@rhs == 2 and defined($rhs[0]) and defined($rhs[1]))
) {
- puke "Operator '${\uc($vk)}' requires either an arrayref with two defined values or expressions, or a single literal scalarref/arrayref-ref";
+ puke "Operator '${\uc($op)}' requires either an arrayref with two defined values or expressions, or a single literal scalarref/arrayref-ref";
}
return +{ -op => [
- join(' ', split '_', $vk),
- { -ident => $k },
+ $op,
+ $self->_expand_ident(-ident => $k),
@rhs
] }
}
- if ($vk =~ /^(?:not[ _])?in$/) {
+ if ($op =~ /^(?:not )?in$/) {
if (my $literal = is_literal_value($vv)) {
my ($sql, @bind) = @$literal;
my $opened_sql = $self->_open_outer_paren($sql);
return +{ -op => [
- $vk, { -ident => $k },
+ $op, $self->_expand_ident(-ident => $k),
[ { -literal => [ $opened_sql, @bind ] } ]
] };
}
my $undef_err =
'SQL::Abstract before v1.75 used to generate incorrect SQL when the '
- . "-${\uc($vk)} operator was given an undef-containing list: !!!AUDIT YOUR CODE "
+ . "-${\uc($op)} operator was given an undef-containing list: !!!AUDIT YOUR CODE "
. 'AND DATA!!! (the upcoming Data::Query-based version of SQL::Abstract '
. 'will emit the logically correct SQL instead of raising this exception)'
;
- puke("Argument passed to the '${\uc($vk)}' operator can not be undefined")
+ puke("Argument passed to the '${\uc($op)}' operator can not be undefined")
if !defined($vv);
my @rhs = map $self->_expand_expr($_),
map { ref($_) ? $_ : { -bind => [ $k, $_ ] } }
map { defined($_) ? $_: puke($undef_err) }
(ref($vv) eq 'ARRAY' ? @$vv : $vv);
- return $self->${\($vk =~ /^not/ ? 'sqltrue' : 'sqlfalse')} unless @rhs;
+ return $self->${\($op =~ /^not/ ? 'sqltrue' : 'sqlfalse')} unless @rhs;
return +{ -op => [
- join(' ', split '_', $vk),
- { -ident => $k },
+ $op,
+ $self->_expand_ident(-ident => $k),
\@rhs
] };
}
- if ($vk eq 'ident') {
+ if ($op eq 'ident') {
if (! defined $vv or (ref($vv) and ref($vv) eq 'ARRAY')) {
- puke "-$vk requires a single plain scalar argument (a quotable identifier) or an arrayref of identifier parts";
+ puke "-$op requires a single plain scalar argument (a quotable identifier) or an arrayref of identifier parts";
}
return +{ -op => [
$self->{cmp},
- { -ident => $k },
- { -ident => $vv }
+ $self->_expand_ident(-ident => $k),
+ $self->_expand_ident(-ident => $vv),
] };
}
- if ($vk eq 'value') {
- return $self->_expand_expr_hashpair($k, undef) unless defined($vv);
+ if ($op eq 'value') {
+ return $self->_expand_expr({ $k, undef }) unless defined($vv);
return +{ -op => [
$self->{cmp},
- { -ident => $k },
+ $self->_expand_ident(-ident => $k),
{ -bind => [ $k, $vv ] }
] };
}
- if ($vk =~ /^is(?:[ _]not)?$/) {
- puke "$vk can only take undef as argument"
+ if ($op =~ /^is(?: not)?$/) {
+ puke "$op can only take undef as argument"
if defined($vv)
and not (
ref($vv) eq 'HASH'
and exists($vv->{-value})
and !defined($vv->{-value})
);
- $vk =~ s/_/ /g;
- return +{ -op => [ $vk.' null', { -ident => $k } ] };
+ return +{ -op => [ $op.' null', $self->_expand_ident(-ident => $k) ] };
}
- if ($vk =~ /^(and|or)$/) {
+ if ($op =~ /^(and|or)$/) {
if (ref($vv) eq 'HASH') {
return +{ -op => [
- $vk,
- map $self->_expand_expr_hashpair($k, { $_ => $vv->{$_} }),
+ $op,
+ map $self->_expand_expr({ $k, { $_ => $vv->{$_} } }),
sort keys %$vv
] };
}
}
- if (my $us = List::Util::first { $vk =~ $_->{regex} } @{$self->{special_ops}}) {
- return { -op => [ $vk, { -ident => $k }, $vv ] };
+ if (my $us = List::Util::first { $op =~ $_->{regex} } @{$self->{special_ops}}) {
+ return { -op => [ $op, $self->_expand_ident(-ident => $k), $vv ] };
}
- if (my $us = List::Util::first { $vk =~ $_->{regex} } @{$self->{unary_ops}}) {
+ if (my $us = List::Util::first { $op =~ $_->{regex} } @{$self->{unary_ops}}) {
return { -op => [
$self->{cmp},
- { -ident => $k },
- { -op => [ $vk, $vv ] }
+ $self->_expand_ident(-ident => $k),
+ { -op => [ $op, $vv ] }
] };
}
if (ref($vv) eq 'ARRAY') {
: (-or => @$vv)
);
if (
- $vk =~ $self->{inequality_op}
- or join(' ', split '_', $vk) =~ $self->{not_like_op}
+ $op =~ $self->{inequality_op}
+ or $op =~ $self->{not_like_op}
) {
if (lc($logic) eq '-or' and @values > 1) {
- my $op = uc join ' ', split '_', $vk;
- belch "A multi-element arrayref as an argument to the inequality op '$op' "
+ belch "A multi-element arrayref as an argument to the inequality op '${\uc($op)}' "
. 'is technically equivalent to an always-true 1=1 (you probably wanted '
. "to say ...{ \$inequality_op => [ -and => \@values ] }... instead)"
;
}
unless (@values) {
# try to DWIM on equality operators
- my $op = join ' ', split '_', $vk;
return
$op =~ $self->{equality_op} ? $self->sqlfalse
: $op =~ $self->{like_op} ? belch("Supplying an empty arrayref to '@{[ uc $op]}' is deprecated") && $self->sqlfalse
}
return +{ -op => [
$logic =~ /^-(.*)$/,
- map $self->_expand_expr_hashpair($k => { $vk => $_ }),
+ map $self->_expand_expr({ $k => { $vk => $_ } }),
@values
] };
}
and not defined $vv->{-value}
)
) {
- my $op = join ' ', split '_', $vk;
my $is =
$op =~ /^not$/i ? 'is not' # legacy
: $op =~ $self->{equality_op} ? 'is'
: $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', { -ident => $k } ] };
+ return +{ -op => [ $is.' null', $self->_expand_ident(-ident => $k) ] };
}
local our $Cur_Col_Meta = $k;
return +{ -op => [
- $vk,
- { -ident => $k },
- $self->_expand_expr($vv)
+ $op,
+ $self->_expand_ident(-ident => $k),
+ $self->_expand_expr($vv)
] };
}
if (ref($v) eq 'ARRAY') {
return $self->sqlfalse unless @$v;
$self->_debug("ARRAY($k) means distribute over elements");
- my $this_logic = (
- $v->[0] =~ /^-((?:and|or))$/i
- ? ($v = [ @{$v}[1..$#$v] ], $1)
- : ($self->{logic} || 'or')
+ my $this_logic = lc(
+ $v->[0] =~ /^-(and|or)$/i
+ ? shift(@{$v = [ @$v ]})
+ : '-'.($self->{logic} || 'or')
);
- return +{ -op => [
- $this_logic,
- map $self->_expand_expr({ $k => $_ }, $this_logic), @$v
- ] };
+ return $self->_expand_expr({
+ $this_logic => [ map +{ $k => $_ }, @$v ]
+ });
}
if (my $literal = is_literal_value($v)) {
unless (length $k) {
die "notreached";
}
+sub _expand_ident {
+ my ($self, undef, $body) = @_;
+ my @parts = map split(/\Q${\($self->{name_sep}||'.')}\E/, $_),
+ ref($body) ? @$body : $body;
+ return { -ident => $parts[-1] } if $self->{_dequalify_idents};
+ unless ($self->{quote_char}) {
+ $self->_assert_pass_injection_guard($_) for @parts;
+ }
+ return +{ -ident => \@parts };
+}
+
+sub _expand_value {
+ +{ -bind => [ our $Cur_Col_Meta, $_[2] ] };
+}
+
+sub _expand_not {
+ +{ -op => [ 'not', $_[0]->_expand_expr($_[2]) ] };
+}
+
+sub _expand_bool {
+ my ($self, undef, $v) = @_;
+ if (ref($v)) {
+ return $self->_expand_expr($v);
+ }
+ puke "-bool => undef not supported" unless defined($v);
+ return $self->_expand_ident(-ident => $v);
+}
+
+sub _expand_andor {
+ my ($self, $k, $v) = @_;
+ my ($logic) = $k =~ /^-(.*)$/;
+ if (ref($v) eq 'HASH') {
+ return +{ -op => [
+ $logic,
+ map $self->_expand_expr({ $_ => $v->{$_} }, $logic),
+ sort keys %$v
+ ] };
+ }
+ if (ref($v) eq 'ARRAY') {
+ $logic eq 'and' or $logic eq 'or' or puke "unknown logic: $logic";
+
+ my @expr = grep {
+ (ref($_) eq 'ARRAY' and @$_)
+ or (ref($_) eq 'HASH' and %$_)
+ or 1
+ } @$v;
+
+ my @res;
+
+ while (my ($el) = splice @expr, 0, 1) {
+ puke "Supplying an empty left hand side argument is not supported in array-pairs"
+ unless defined($el) and length($el);
+ my $elref = ref($el);
+ if (!$elref) {
+ local our $Expand_Depth = 0;
+ push(@res, grep defined, $self->_expand_expr({ $el, shift(@expr) }));
+ } elsif ($elref eq 'ARRAY') {
+ push(@res, grep defined, $self->_expand_expr($el)) if @$el;
+ } elsif (my $l = is_literal_value($el)) {
+ push @res, { -literal => $l };
+ } elsif ($elref eq 'HASH') {
+ local our $Expand_Depth = 0;
+ push @res, grep defined, $self->_expand_expr($el) if %$el;
+ } else {
+ die "notreached";
+ }
+ }
+ # ???
+ # return $res[0] if @res == 1;
+ return { -op => [ $logic, @res ] };
+ }
+ die "notreached";
+}
+
sub _recurse_where {
my ($self, $where, $logic) = @_;
my $us = List::Util::first { $op =~ $_->{regex} } @{$self->{special_ops}};
if ($us and @args > 1) {
puke "Special op '${op}' requires first value to be identifier"
- unless my ($k) = map $_->{-ident}, grep ref($_) eq 'HASH', $args[0];
+ unless my ($ident) = map $_->{-ident}, grep ref($_) eq 'HASH', $args[0];
+ my $k = join(($self->{name_sep}||'.'), @$ident);
local our $Expand_Depth = 1;
return $self->${\($us->{handler})}($k, $op, $args[1]);
}
puke "ordering direction hash passed to order by must have exactly one key (-asc or -desc)";
}
}
- my @exp = map +(defined($dir) ? { -op => [ $dir => $_ ] } : $_),
+ my @exp = map +(
+ defined($dir) ? { -op => [ $dir =~ /^-?(.*)$/ ,=> $_ ] } : $_
+ ),
map $self->expand_expr($_, -ident),
map ref($_) eq 'ARRAY' ? @$_ : $_, @to_expand;
return (@exp > 1 ? { -list => \@exp } : $exp[0]);
};
- local @{$self->{expand_unary}}{qw(-asc -desc)} = (
- sub { shift->$expander(asc => @_) },
- sub { shift->$expander(desc => @_) },
- );
+ local @{$self->{expand}}{qw(-asc -desc)} = (($expander) x 2);
return $self->$expander(undef, $arg);
}