X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FSQL%2FAbstract.pm;h=23a9dd692d75161c711db4b841f05264beed012f;hb=24cd952533bd92329da95784347da9754b870533;hp=53a92b0a40081df7d3a0b6a1bed339313c582f48;hpb=b23fd5ffc63da6046b36d4926e575b4c1935e8b4;p=scpubgit%2FQ-Branch.git diff --git a/lib/SQL/Abstract.pm b/lib/SQL/Abstract.pm index 53a92b0..23a9dd6 100644 --- a/lib/SQL/Abstract.pm +++ b/lib/SQL/Abstract.pm @@ -38,7 +38,6 @@ our $AUTOLOAD; # See section WHERE: BUILTIN SPECIAL OPERATORS below for implementation my @BUILTIN_SPECIAL_OPS = ( {regex => qr/^ (?: not \s )? between $/ix, handler => sub { die "NOPE" }}, - {regex => qr/^ (?: not \s )? in $/ix, handler => sub { die "NOPE" }}, {regex => qr/^ is (?: \s+ not )? $/ix, handler => sub { die "NOPE" }}, ); @@ -68,6 +67,15 @@ sub is_literal_value ($) { : undef; } +sub is_undef_value ($) { + !defined($_[0]) + or ( + ref($_[0]) eq 'HASH' + and exists $_[0]->{-value} + and not defined $_[0]->{-value} + ); +} + # FIXME XSify - this can be done so much more efficiently sub is_plain_value ($) { no strict 'refs'; @@ -162,7 +170,7 @@ sub new { if ($class->isa('DBIx::Class::SQLMaker')) { push @{$opt{special_ops}}, our $DBIC_Compat_Op ||= { - regex => qr/^(?:ident|value)$/i, handler => sub { die "NOPE" } + regex => qr/^(?:ident|value|(?:not\s)?in)$/i, handler => sub { die "NOPE" } }; $opt{is_dbic_sqlmaker} = 1; } @@ -187,21 +195,54 @@ sub new { $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', + -bind => sub { shift; +{ @_ } }, + }; + + $opt{expand_op} = { + 'between' => '_expand_between', + 'not between' => '_expand_between', + 'in' => '_expand_in', + 'not in' => '_expand_in', + 'nest' => '_expand_nest', + (map +($_ => '_expand_op_andor'), ('and', 'or')), + (map +($_ => '_expand_op_is'), ('is', 'is not')), }; - $opt{render_op} = our $RENDER_OP; + # 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 $self->_expand_expr_hashpair_cmp( + $k, { "-${op}" => $arg } + ); + }; + } + } $opt{render} = { (map +("-$_", "_render_$_"), qw(op func bind ident literal list)), %{$opt{render}||{}} }; + $opt{render_op} = { + (map +($_ => '_render_op_between'), 'between', 'not between'), + (map +($_ => '_render_op_in'), 'in', 'not in'), + (map +($_ => '_render_unop_postfix'), + 'is null', 'is not null', 'asc', 'desc', + ), + (not => '_render_op_not'), + (map +($_ => '_render_op_andor'), qw(and or)), + }; + return bless \%opt, $class; } @@ -514,6 +555,8 @@ sub where { return wantarray ? ($sql, @bind) : $sql; } +{ our $Default_Scalar_To = -value } + sub expand_expr { my ($self, $expr, $default_scalar_to) = @_; local our $Default_Scalar_To = $default_scalar_to if $default_scalar_to; @@ -535,15 +578,20 @@ sub render_expr { $self->render_aqt($self->expand_expr($expr)); } +sub _normalize_op { + my ($self, $raw) = @_; + s/^-(?=[a-z])//, s/\s+/_/g for my $op = lc $raw; + $op; +} + sub _expand_expr { - my ($self, $expr, $logic) = @_; + my ($self, $expr) = @_; our $Expand_Depth ||= 0; local $Expand_Depth = $Expand_Depth + 1; return undef unless defined($expr); if (ref($expr) eq 'HASH') { return undef unless my $kc = keys %$expr; if ($kc > 1) { - $logic ||= 'and'; - return $self->_expand_andor("-${logic}", $expr); + return $self->_expand_op_andor(-and => $expr); } my ($key, $value) = %$expr; if ($key =~ /^-/ and $key =~ s/ [_\s]? \d+ $//x ) { @@ -553,26 +601,23 @@ sub _expand_expr { if (my $exp = $self->{expand}{$key}) { return $self->$exp($key, $value); } - return $self->_expand_expr_hashpair($key, $value, $logic); + return $self->_expand_expr_hashpair($key, $value); } if (ref($expr) eq 'ARRAY') { - my $logic = lc($logic || $self->{logic}); - return $self->_expand_andor("-${logic}", $expr); + my $logic = '-'.lc($self->{logic}); + return $self->_expand_op_andor($logic, $expr); } if (my $literal = is_literal_value($expr)) { return +{ -literal => $literal }; } if (!ref($expr) or Scalar::Util::blessed($expr)) { - if (my $d = our $Default_Scalar_To) { - return $self->_expand_expr({ $d => $expr }); - } - return $self->_expand_value(-value => $expr); + return $self->_expand_expr_scalar($expr); } die "notreached"; } sub _expand_expr_hashpair { - my ($self, $k, $v, $logic) = @_; + my ($self, $k, $v) = @_; unless (defined($k) and length($k)) { if (defined($k) and my $literal = is_literal_value($v)) { belch 'Hash-pairs consisting of an empty string with a literal are deprecated, and will be removed in 2.0: use -and => [ $literal ] instead'; @@ -581,263 +626,55 @@ sub _expand_expr_hashpair { puke "Supplying an empty left hand side argument is not supported"; } if ($k =~ /^-/) { - $self->_assert_pass_injection_guard($k =~ /^-(.*)$/s); - 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 - if ($self->{is_dbic_sqlmaker}) { - unless (our $Nest_Warned) { - belch( - "-nest in search conditions is deprecated, you most probably wanted:\n" - .q|{..., -and => [ \%cond0, \@cond1, \'cond2', \[ 'cond3', [ col => bind ] ], etc. ], ... }| - ); - $Nest_Warned = 1; - } - } - return $self->_expand_expr($v); - } - if (my ($rest) = $k =~/^-not[_ ](.*)$/) { - return +{ -op => [ - 'not', - $self->_expand_expr({ "-${rest}", $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 - # 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); } - if ( - !defined($v) - or ( - ref($v) eq 'HASH' - and exists $v->{-value} - and not defined $v->{-value} - ) - ) { - return $self->_expand_expr({ $k => { $self->{cmp} => undef } }); + return $self->_expand_expr_hashpair_ident($k, $v); +} + +sub _expand_expr_hashpair_ident { + my ($self, $k, $v) = @_; + + local our $Cur_Col_Meta = $k; + + # hash with multiple or no elements is andor + + if (ref($v) eq 'HASH' and keys %$v != 1) { + return $self->_expand_op_andor(-and => $v, $k); } + + # undef needs to be re-sent with cmp to achieve IS/IS NOT NULL + + if (is_undef_value($v)) { + return $self->_expand_expr_hashpair_cmp($k => undef); + } + + # 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 ] } - ) - ] - }; + return $self->_expand_expr_hashpair_scalar($k, $v); } + + # single key hashref is a hashtriple + if (ref($v) eq 'HASH') { - if (keys %$v > 1) { - return { -op => [ - 'and', - map $self->_expand_expr({ $k => { $_ => $v->{$_} } }), - sort keys %$v - ] }; - } - 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 ... ]"; - } - if ($op =~ /^(?:not )?between$/) { - local our $Cur_Col_Meta = $k; - my @rhs = map $self->_expand_expr($_), - ref($vv) eq 'ARRAY' ? @$vv : $vv; - unless ( - (@rhs == 1 and ref($rhs[0]) eq 'HASH' and $rhs[0]->{-literal}) - or - (@rhs == 2 and defined($rhs[0]) and defined($rhs[1])) - ) { - puke "Operator '${\uc($op)}' requires either an arrayref with two defined values or expressions, or a single literal scalarref/arrayref-ref"; - } - return +{ -op => [ - $op, - $self->_expand_ident(-ident => $k), - @rhs - ] } - } - 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 => [ - $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($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($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->${\($op =~ /^not/ ? 'sqltrue' : 'sqlfalse')} unless @rhs; - - return +{ -op => [ - $op, - $self->_expand_ident(-ident => $k), - \@rhs - ] }; - } - if ($op eq 'ident') { - if (! defined $vv or (ref($vv) and ref($vv) eq 'ARRAY')) { - puke "-$op requires a single plain scalar argument (a quotable identifier) or an arrayref of identifier parts"; - } - return +{ -op => [ - $self->{cmp}, - $self->_expand_ident(-ident => $k), - $self->_expand_ident(-ident => $vv), - ] }; - } - if ($op eq 'value') { - return $self->_expand_expr({ $k, undef }) unless defined($vv); - return +{ -op => [ - $self->{cmp}, - $self->_expand_ident(-ident => $k), - { -bind => [ $k, $vv ] } - ] }; - } - 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}) - ); - return +{ -op => [ $op.' null', $self->_expand_ident(-ident => $k) ] }; - } - if ($op =~ /^(and|or)$/) { - if (ref($vv) eq 'HASH') { - return +{ -op => [ - $op, - map $self->_expand_expr({ $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 ] }; - } - if (my $us = List::Util::first { $op =~ $_->{regex} } @{$self->{unary_ops}}) { - return { -op => [ - $self->{cmp}, - $self->_expand_ident(-ident => $k), - { -op => [ $op, $vv ] } - ] }; - } - if (ref($vv) eq 'ARRAY') { - my ($logic, @values) = ( - (defined($vv->[0]) and $vv->[0] =~ /^-(and|or)$/i) - ? @$vv - : (-or => @$vv) - ); - if ( - $op =~ $self->{inequality_op} - or $op =~ $self->{not_like_op} - ) { - if (lc($logic) eq '-or' and @values > 1) { - 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 - return - $op =~ $self->{equality_op} ? $self->sqlfalse - : $op =~ $self->{like_op} ? belch("Supplying an empty arrayref to '@{[ uc $op]}' is deprecated") && $self->sqlfalse - : $op =~ $self->{inequality_op} ? $self->sqltrue - : $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 +{ -op => [ - $logic =~ /^-(.*)$/, - map $self->_expand_expr({ $k => { $vk => $_ } }), - @values - ] }; - } - if ( - !defined($vv) - or ( - ref($vv) eq 'HASH' - and exists $vv->{-value} - and not defined $vv->{-value} - ) - ) { - my $is = - $op =~ /^not$/i ? 'is not' # legacy - : $op =~ $self->{equality_op} ? 'is' - : $op =~ $self->{like_op} ? belch("Supplying an undefined argument to '@{[ uc $op]}' is deprecated") && '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', $self->_expand_ident(-ident => $k) ] }; - } - local our $Cur_Col_Meta = $k; - return +{ -op => [ - $op, - $self->_expand_ident(-ident => $k), - $self->_expand_expr($vv) - ] }; + return $self->_expand_expr_hashtriple($k, %$v); } + + # arrayref needs re-engineering over the elements + if (ref($v) eq 'ARRAY') { return $self->sqlfalse unless @$v; $self->_debug("ARRAY($k) means distribute over elements"); - my $this_logic = lc( + my $logic = lc( $v->[0] =~ /^-(and|or)$/i ? shift(@{$v = [ @$v ]}) - : '-'.($self->{logic} || 'or') + : '-'.lc($self->{logic} || 'OR') + ); + return $self->_expand_op_andor( + $logic => $v, $k ); - return $self->_expand_expr({ - $this_logic => [ map +{ $k => $_ }, @$v ] - }); } + if (my $literal = is_literal_value($v)) { unless (length $k) { belch 'Hash-pairs consisting of an empty string with a literal are deprecated, and will be removed in 2.0: use -and => [ $literal ] instead'; @@ -854,8 +691,195 @@ sub _expand_expr_hashpair { die "notreached"; } +sub _expand_expr_scalar { + my ($self, $expr) = @_; + + return $self->_expand_expr({ (our $Default_Scalar_To) => $expr }); +} + +sub _expand_expr_hashpair_scalar { + my ($self, $k, $v) = @_; + + return $self->_expand_expr_hashpair_cmp( + $k, $self->_expand_expr_scalar($v), + ); +} + +sub _expand_expr_hashpair_op { + my ($self, $k, $v) = @_; + + my $op = $self->_normalize_op($k); + + $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 }) + ] }; + } + + + { # Old SQLA compat + + my $op = join(' ', split '_', $op); + + # 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 =~ /^-(.*)$/; + { # Old SQLA compat + 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_expr_hashpair_cmp { + my ($self, $k, $v) = @_; + $self->_expand_expr_hashtriple($k, $self->{cmp}, $v); +} + +sub _expand_expr_hashtriple { + my ($self, $k, $vk, $vv) = @_; + + my $ik = $self->_expand_ident(-ident => $k); + + my $op = $self->_normalize_op($vk); + $self->_assert_pass_injection_guard($op); + + if ($op =~ s/ _? \d+ $//x ) { + return $self->_expand_expr($k, { $vk, $vv }); + } + if (my $x = $self->{expand_op}{$op}) { + local our $Cur_Col_Meta = $k; + return $self->$x($op, $vv, $k); + } + { # Old SQLA compat + + my $op = join(' ', split '_', $op); + + if (my $us = List::Util::first { $op =~ $_->{regex} } @{$self->{special_ops}}) { + return { -op => [ $op, $ik, $vv ] }; + } + if (my $us = List::Util::first { $op =~ $_->{regex} } @{$self->{unary_ops}}) { + return { -op => [ + $self->{cmp}, + $ik, + { -op => [ $op, $vv ] } + ] }; + } + } + if (ref($vv) eq 'ARRAY') { + my @raw = @$vv; + my $logic = (defined($raw[0]) and $raw[0] =~ /^-(and|or)$/i) + ? shift @raw : '-or'; + my @values = map +{ $vk => $_ }, @raw; + if ( + $op =~ $self->{inequality_op} + or $op =~ $self->{not_like_op} + ) { + if (lc($logic) eq '-or' and @values > 1) { + 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 + return ($self->_dwim_op_to_is($op, + "Supplying an empty arrayref to '%s' is deprecated", + "operator '%s' applied on an empty array (field '$k')" + ) ? $self->sqlfalse : $self->sqltrue); + } + return $self->_expand_op_andor($logic => \@values, $k); + } + if (is_undef_value($vv)) { + my $is = ($self->_dwim_op_to_is($op, + "Supplying an undefined argument to '%s' is deprecated", + "unexpected operator '%s' with undef operand", + ) ? 'is' : 'is not'); + + return $self->_expand_expr_hashpair($k => { $is, undef }); + } + local our $Cur_Col_Meta = $k; + return +{ -op => [ + $op, + $ik, + $self->_expand_expr($vv) + ] }; +} + +sub _dwim_op_to_is { + my ($self, $raw, $empty, $fail) = @_; + + my $op = $self->_normalize_op($raw); + + if ($op =~ /^not$/i) { + return 0; + } + if ($op =~ $self->{equality_op}) { + return 1; + } + if ($op =~ $self->{like_op}) { + belch(sprintf $empty, uc($op)); + return 1; + } + if ($op =~ $self->{inequality_op}) { + return 0; + } + if ($op =~ $self->{not_like_op}) { + belch(sprintf $empty, uc($op)); + return 0; + } + puke(sprintf $fail, $op); +} + sub _expand_ident { - my ($self, undef, $body) = @_; + my ($self, $op, $body) = @_; + unless (defined($body) or (ref($body) and ref($body) eq 'ARRAY')) { + puke "$op requires a single plain scalar argument (a quotable identifier) or an arrayref of identifier parts"; + } my @parts = map split(/\Q${\($self->{name_sep}||'.')}\E/, $_), ref($body) ? @$body : $body; return { -ident => $parts[-1] } if $self->{_dequalify_idents}; @@ -882,18 +906,26 @@ sub _expand_bool { return $self->_expand_ident(-ident => $v); } -sub _expand_andor { - my ($self, $k, $v) = @_; - my ($logic) = $k =~ /^-(.*)$/; +sub _expand_op_andor { + my ($self, $logic, $v, $k) = @_; + if (defined $k) { + $v = [ map +{ $k, $_ }, + (ref($v) eq 'HASH') + ? (map +{ $_ => $v->{$_} }, sort keys %$v) + : @$v, + ]; + } + my ($logop) = $logic =~ /^-?(.*)$/; if (ref($v) eq 'HASH') { + return undef unless keys %$v; return +{ -op => [ - $logic, - map $self->_expand_expr({ $_ => $v->{$_} }, $logic), + $logop, + map $self->_expand_expr({ $_ => $v->{$_} }), sort keys %$v ] }; } if (ref($v) eq 'ARRAY') { - $logic eq 'and' or $logic eq 'or' or puke "unknown logic: $logic"; + $logop eq 'and' or $logop eq 'or' or puke "unknown logic: $logop"; my @expr = grep { (ref($_) eq 'ARRAY' and @$_) @@ -923,11 +955,89 @@ sub _expand_andor { } # ??? # return $res[0] if @res == 1; - return { -op => [ $logic, @res ] }; + return { -op => [ $logop, @res ] }; } die "notreached"; } +sub _expand_op_is { + my ($self, $op, $vv, $k) = @_; + 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}) + ); + return +{ -op => [ $op.' null', $self->_expand_ident(-ident => $k) ] }; +} + +sub _expand_between { + my ($self, $op, $vv, $k) = @_; + local our $Cur_Col_Meta = $k; + my @rhs = map $self->_expand_expr($_), + ref($vv) eq 'ARRAY' ? @$vv : $vv; + unless ( + (@rhs == 1 and ref($rhs[0]) eq 'HASH' and $rhs[0]->{-literal}) + or + (@rhs == 2 and defined($rhs[0]) and defined($rhs[1])) + ) { + puke "Operator '${\uc($op)}' requires either an arrayref with two defined values or expressions, or a single literal scalarref/arrayref-ref"; + } + return +{ -op => [ + $op, + $self->_expand_ident(-ident => $k), + @rhs + ] } +} + +sub _expand_in { + my ($self, $op, $vv, $k) = @_; + if (my $literal = is_literal_value($vv)) { + my ($sql, @bind) = @$literal; + my $opened_sql = $self->_open_outer_paren($sql); + return +{ -op => [ + $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($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($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->${\($op =~ /^not/ ? 'sqltrue' : 'sqlfalse')} unless @rhs; + + return +{ -op => [ + $op, + $self->_expand_ident(-ident => $k), + \@rhs + ] }; +} + +sub _expand_nest { + my ($self, $op, $v) = @_; + # DBIx::Class requires a nest warning to be emitted once but the private + # method it overrode to do so no longer exists + if ($self->{is_dbic_sqlmaker}) { + unless (our $Nest_Warned) { + belch( + "-nest in search conditions is deprecated, you most probably wanted:\n" + .q|{..., -and => [ \%cond0, \@cond1, \'cond2', \[ 'cond3', [ col => bind ] ], etc. ], ... }| + ); + $Nest_Warned = 1; + } + } + return $self->_expand_expr($v); +} + sub _recurse_where { my ($self, $where, $logic) = @_; @@ -986,107 +1096,119 @@ sub _render_literal { return @$literal; } -our $RENDER_OP = { - (map +($_ => do { - sub { - my ($self, $op, $args) = @_; - my ($left, $low, $high) = @$args; - my ($rhsql, @rhbind) = do { - if (@$args == 2) { - puke "Single arg to between must be a literal" - unless $low->{-literal}; - @{$low->{-literal}} - } else { - my ($l, $h) = map [ $self->render_aqt($_) ], $low, $high; - (join(' ', $l->[0], $self->_sqlcase('and'), $h->[0]), - @{$l}[1..$#$l], @{$h}[1..$#$h]) - } - }; - my ($lhsql, @lhbind) = $self->render_aqt($left); - return ( - join(' ', '(', $lhsql, $self->_sqlcase($op), $rhsql, ')'), - @lhbind, @rhbind - ); - } - }), 'between', 'not between'), - (map +($_ => do { - sub { - my ($self, $op, $args) = @_; - my ($lhs, $rhs) = @$args; - my @in_bind; - my @in_sql = map { - my ($sql, @bind) = $self->render_aqt($_); - push @in_bind, @bind; - $sql; - } @$rhs; - my ($lhsql, @lbind) = $self->render_aqt($lhs); - return ( - $lhsql.' '.$self->_sqlcase($op).' ( ' - .join(', ', @in_sql) - .' )', - @lbind, @in_bind - ); - } - }), 'in', 'not in'), - (map +($_ => '_render_unop_postfix'), - 'is null', 'is not null', 'asc', 'desc', - ), -}; - -my %unop_postfix = map +($_ => 1), - 'is null', 'is not null', - 'asc', 'desc', -; - sub _render_op { my ($self, $v) = @_; my ($op, @args) = @$v; if (my $r = $self->{render_op}{$op}) { return $self->$r($op, \@args); } - 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 ($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]); - } - if (my $us = List::Util::first { $op =~ $_->{regex} } @{$self->{unary_ops}}) { - return $self->${\($us->{handler})}($op, $args[0]); - } - if (@args == 1 and $op !~ /^(and|or)$/) { - my ($expr_sql, @bind) = $self->render_aqt($args[0]); - my $op_sql = $self->_sqlcase($op); - my $final_sql = ( - $unop_postfix{lc($op)} - ? "${expr_sql} ${op_sql}" - : "${op_sql} ${expr_sql}" - ); - return (($op eq 'not' || $us ? '('.$final_sql.')' : $final_sql), @bind); + + { # Old SQLA compat + + my $op = join(' ', split '_', $op); + + 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 ($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]); + } + if (my $us = List::Util::first { $op =~ $_->{regex} } @{$self->{unary_ops}}) { + return $self->${\($us->{handler})}($op, $args[0]); + } + + } + if (@args == 1) { + return $self->_render_unop_prefix($op, \@args); } else { - my @parts = grep length($_->[0]), map [ $self->render_aqt($_) ], @args; - return '' unless @parts; - my $is_andor = !!($op =~ /^(and|or)$/); - return @{$parts[0]} if $is_andor and @parts == 1; - my ($final_sql) = map +($is_andor ? "( ${_} )" : $_), join( - ' '.$self->_sqlcase($op).' ', - map $_->[0], @parts - ); - return ( - $final_sql, - map @{$_}[1..$#$_], @parts - ); - } - die "unhandled"; + return $self->_render_op_multop($op, \@args); + } + die "notreached"; +} + + +sub _render_op_between { + my ($self, $op, $args) = @_; + my ($left, $low, $high) = @$args; + my ($rhsql, @rhbind) = do { + if (@$args == 2) { + puke "Single arg to between must be a literal" + unless $low->{-literal}; + @{$low->{-literal}} + } else { + my ($l, $h) = map [ $self->render_aqt($_) ], $low, $high; + (join(' ', $l->[0], $self->_sqlcase('and'), $h->[0]), + @{$l}[1..$#$l], @{$h}[1..$#$h]) + } + }; + my ($lhsql, @lhbind) = $self->render_aqt($left); + return ( + join(' ', '(', $lhsql, $self->_sqlcase($op), $rhsql, ')'), + @lhbind, @rhbind + ); +} + +sub _render_op_in { + my ($self, $op, $args) = @_; + my ($lhs, $rhs) = @$args; + my @in_bind; + my @in_sql = map { + my ($sql, @bind) = $self->render_aqt($_); + push @in_bind, @bind; + $sql; + } @$rhs; + my ($lhsql, @lbind) = $self->render_aqt($lhs); + return ( + $lhsql.' '.$self->_sqlcase($op).' ( ' + .join(', ', @in_sql) + .' )', + @lbind, @in_bind + ); +} + +sub _render_op_andor { + my ($self, $op, $args) = @_; + my @parts = grep length($_->[0]), map [ $self->render_aqt($_) ], @$args; + return '' unless @parts; + return @{$parts[0]} if @parts == 1; + my ($sql, @bind) = $self->_render_op_multop($op, $args); + return '( '.$sql.' )', @bind; +} + +sub _render_op_multop { + my ($self, $op, $args) = @_; + my @parts = grep length($_->[0]), map [ $self->render_aqt($_) ], @$args; + return '' unless @parts; + return @{$parts[0]} if @parts == 1; + my ($final_sql) = join( + ' '.$self->_sqlcase($op).' ', + map $_->[0], @parts + ); + return ( + $final_sql, + map @{$_}[1..$#$_], @parts + ); +} +sub _render_op_not { + my ($self, $op, $v) = @_; + my ($sql, @bind) = $self->_render_unop_prefix($op, $v); + return "(${sql})", @bind; +} + +sub _render_unop_prefix { + my ($self, $op, $v) = @_; + my ($expr_sql, @bind) = $self->render_aqt($v->[0]); + + my $op_sql = $self->_sqlcase(join ' ', split '_', $op); + return ("${op_sql} ${expr_sql}", @bind); } sub _render_unop_postfix { my ($self, $op, $v) = @_; - my ($arg, @argh) = @$v; - puke "Argh" if @argh; - my ($expr_sql, @bind) = $self->render_aqt($arg); - my $op_sql = $self->_sqlcase($op); + my ($expr_sql, @bind) = $self->render_aqt($v->[0]); + my $op_sql = $self->_sqlcase(join ' ', split '_', $op); return ($expr_sql.' '.$op_sql, @bind); }