X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FSQL%2FAbstract.pm;h=dfd317c674100cdf3f3c4c42effb63ac5aec74eb;hb=70f98e4bba2ff14a3750ef75a9cb1ea575df6acb;hp=2d1a7b1642522ff3c5d07e233d9a72e938dcbf01;hpb=b3cb13e8cefc48d724f02a2363f2b9d7a8e745da;p=scpubgit%2FQ-Branch.git diff --git a/lib/SQL/Abstract.pm b/lib/SQL/Abstract.pm index 2d1a7b1..dfd317c 100644 --- a/lib/SQL/Abstract.pm +++ b/lib/SQL/Abstract.pm @@ -39,26 +39,9 @@ our $AUTOLOAD; 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/^ ident $/ix, handler => sub { die "NOPE" }}, - {regex => qr/^ value $/ix, handler => sub { die "NOPE" }}, {regex => qr/^ is (?: \s+ not )? $/ix, handler => sub { die "NOPE" }}, ); -# unaryish operators - key maps to handler -my @BUILTIN_UNARY_OPS = ( - # the digits are backcompat stuff - { regex => qr/^ and (?: [_\s]? \d+ )? $/xi, handler => '_where_op_ANDOR' }, - { regex => qr/^ or (?: [_\s]? \d+ )? $/xi, handler => '_where_op_ANDOR' }, - { regex => qr/^ nest (?: [_\s]? \d+ )? $/xi, handler => '_where_op_NEST' }, - { regex => qr/^ (?: not \s )? bool $/xi, handler => '_where_op_BOOL' }, - { regex => qr/^ ident $/xi, handler => '_where_op_IDENT' }, - { regex => qr/^ value $/xi, handler => '_where_op_VALUE' }, - { regex => qr/^ op $/xi, handler => '_where_op_OP' }, - { regex => qr/^ bind $/xi, handler => '_where_op_BIND' }, - { regex => qr/^ literal $/xi, handler => '_where_op_LITERAL' }, - { regex => qr/^ func $/xi, handler => '_where_op_FUNC' }, -); - #====================================================================== # DEBUGGING AND ERROR REPORTING #====================================================================== @@ -172,13 +155,20 @@ sub new { $opt{sqlfalse} ||= '0=1'; # special operators - $opt{user_special_ops} = [ @{$opt{special_ops} ||= []} ]; + $opt{special_ops} ||= []; + # regexes are applied in order, thus push after user-defines push @{$opt{special_ops}}, @BUILTIN_SPECIAL_OPS; + if ($class->isa('DBIx::Class::SQLMaker')) { + push @{$opt{special_ops}}, our $DBIC_Compat_Op ||= { + regex => qr/^(?:ident|value)$/i, handler => sub { die "NOPE" } + }; + $opt{is_dbic_sqlmaker} = 1; + } + # unary operators $opt{unary_ops} ||= []; - push @{$opt{unary_ops}}, @BUILTIN_UNARY_OPS; # rudimentary sanity-check for user supplied bits treated as functions/operators # If a purported function matches this regular expression, an exception is thrown. @@ -194,9 +184,27 @@ sub new { ^ \s* go \s /xmi; + $opt{render} = { + (map +("-$_", "_render_$_"), qw(op func bind ident literal list)), + %{$opt{render}||{}} + }; + + $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; } +sub sqltrue { +{ -literal => [ $_[0]->{sqltrue} ] } } +sub sqlfalse { +{ -literal => [ $_[0]->{sqlfalse} ] } } sub _assert_pass_injection_guard { if ($_[1] =~ $_[0]->{injection_guard}) { @@ -240,12 +248,12 @@ sub _returning { my $f = $options->{returning}; - my $fieldlist = $self->_SWITCH_refkind($f, { - ARRAYREF => sub {join ', ', map { $self->_quote($_) } @$f;}, - SCALAR => sub {$self->_quote($f)}, - SCALARREF => sub {$$f}, - }); - return $self->_sqlcase(' returning ') . $fieldlist; + my ($sql, @bind) = $self->render_aqt( + $self->_expand_maybe_list_expr($f, undef, -ident) + ); + return wantarray + ? $self->_sqlcase(' returning ') . $sql + : ($self->_sqlcase(' returning ').$sql, @bind); } sub _insert_HASHREF { # explicit list of fields and then values @@ -311,50 +319,33 @@ sub _insert_values { sub _insert_value { my ($self, $column, $v) = @_; - my (@values, @all_bind); - $self->_SWITCH_refkind($v, { - - ARRAYREF => sub { - if ($self->{array_datatypes}) { # if array datatype are activated - push @values, '?'; - push @all_bind, $self->_bindtype($column, $v); - } - else { # else literal SQL with bind - my ($sql, @bind) = @$v; - $self->_assert_bindval_matches_bindtype(@bind); - push @values, $sql; - push @all_bind, @bind; - } - }, - - ARRAYREFREF => sub { # literal SQL with bind - my ($sql, @bind) = @${$v}; - $self->_assert_bindval_matches_bindtype(@bind); - push @values, $sql; - push @all_bind, @bind; - }, - - # THINK: anything useful to do with a HASHREF ? - HASHREF => sub { # (nothing, but old SQLA passed it through) - #TODO in SQLA >= 2.0 it will die instead - belch "HASH ref as bind value in insert is not supported"; - push @values, '?'; - push @all_bind, $self->_bindtype($column, $v); - }, - - SCALARREF => sub { # literal SQL without bind - push @values, $$v; - }, - - SCALAR_or_UNDEF => sub { - push @values, '?'; - push @all_bind, $self->_bindtype($column, $v); - }, + return $self->render_aqt( + $self->_expand_insert_value($column, $v) + ); +} - }); +sub _expand_insert_value { + my ($self, $column, $v) = @_; - my $sql = join(", ", @values); - return ($sql, @all_bind); + if (ref($v) eq 'ARRAY') { + if ($self->{array_datatypes}) { + return +{ -bind => [ $column, $v ] }; + } + my ($sql, @bind) = @$v; + $self->_assert_bindval_matches_bindtype(@bind); + return +{ -literal => $v }; + } + if (ref($v) eq 'HASH') { + if (grep !/^-/, keys %$v) { + belch "HASH ref as bind value in insert is not supported"; + return +{ -bind => [ $column, $v ] }; + } + } + if (!defined($v)) { + return +{ -bind => [ $column, undef ] }; + } + local our $Cur_Col_Meta = $column; + return $self->expand_expr($v); } @@ -397,57 +388,33 @@ sub update { sub _update_set_values { my ($self, $data) = @_; - my (@set, @all_bind); - for my $k (sort keys %$data) { - my $v = $data->{$k}; - my $r = ref $v; - my $label = $self->_quote($k); - - $self->_SWITCH_refkind($v, { - ARRAYREF => sub { - if ($self->{array_datatypes}) { # array datatype - push @set, "$label = ?"; - push @all_bind, $self->_bindtype($k, $v); - } - else { # literal SQL with bind - my ($sql, @bind) = @$v; - $self->_assert_bindval_matches_bindtype(@bind); - push @set, "$label = $sql"; - push @all_bind, @bind; - } - }, - ARRAYREFREF => sub { # literal SQL with bind - my ($sql, @bind) = @${$v}; - $self->_assert_bindval_matches_bindtype(@bind); - push @set, "$label = $sql"; - push @all_bind, @bind; - }, - SCALARREF => sub { # literal SQL without bind - push @set, "$label = $$v"; - }, - HASHREF => sub { - my ($op, $arg, @rest) = %$v; - - puke 'Operator calls in update must be in the form { -op => $arg }' - if (@rest or not $op =~ /^\-(.+)/); - - local $self->{_nested_func_lhs} = $k; - my ($sql, @bind) = $self->_where_unary_op($1, $arg); - - push @set, "$label = $sql"; - push @all_bind, @bind; - }, - SCALAR_or_UNDEF => sub { - push @set, "$label = ?"; - push @all_bind, $self->_bindtype($k, $v); - }, - }); - } - - # generate sql - my $sql = join ', ', @set; + return $self->render_aqt( + $self->_expand_update_set_values($data), + ); +} - return ($sql, @all_bind); +sub _expand_update_set_values { + my ($self, $data) = @_; + $self->_expand_maybe_list_expr( [ + map { + my ($k, $set) = @$_; + $set = { -bind => $_ } unless defined $set; + +{ -op => [ '=', $self->_expand_ident(-ident => $k), $set ] }; + } + map { + my $k = $_; + my $v = $data->{$k}; + (ref($v) eq 'ARRAY' + ? ($self->{array_datatypes} + ? [ $k, +{ -bind => [ $k, $v ] } ] + : [ $k, +{ -literal => $v } ]) + : do { + local our $Cur_Col_Meta = $k; + [ $k, $self->_expand_expr($v) ] + } + ); + } sort keys %$data + ] ); } # So that subclasses can override UPDATE ... RETURNING separately from @@ -482,8 +449,10 @@ sub select { sub _select_fields { my ($self, $fields) = @_; - return ref $fields eq 'ARRAY' ? join ', ', map { $self->_quote($_) } @$fields - : $fields; + return $fields unless ref($fields); + return $self->render_aqt( + $self->_expand_maybe_list_expr($fields, undef, '-ident') + ); } #====================================================================== @@ -525,8 +494,12 @@ sub _delete_returning { shift->_returning(@_) } sub where { my ($self, $where, $order) = @_; + local $self->{convert_where} = $self->{convert}; + # where ? - my ($sql, @bind) = $self->_recurse_where($where); + my ($sql, @bind) = defined($where) + ? $self->_recurse_where($where) + : (undef); $sql = (defined $sql and length $sql) ? $self->_sqlcase(' where ') . "( $sql )" : ''; # order by? @@ -539,56 +512,63 @@ sub where { return wantarray ? ($sql, @bind) : $sql; } +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); +} + +sub render_aqt { + my ($self, $aqt) = @_; + my ($k, $v, @rest) = %$aqt; + die "No" if @rest; + if (my $meth = $self->{render}{$k}) { + return $self->$meth($v); + } + die "notreached: $k"; +} + +sub render_expr { + my ($self, $expr) = @_; + $self->render_aqt($self->expand_expr($expr)); +} + sub _expand_expr { 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 +{ "-${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 unless %$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 = @$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) { - 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 ($elref eq 'HASH') { - push @res, $self->_expand_expr($el); - } else { - die "unimplemented" - } - } - return { '-'.$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 = our $Default_Scalar_To) { + return $self->_expand_expr({ $d => $expr }); + } if (my $m = our $Cur_Col_Meta) { return +{ -bind => [ $m, $expr ] }; } - return +{ -value => $expr }; + return +{ -bind => [ undef, $expr ] }; } - #::Ddie([ HUH => $expr ]); die "notreached"; } @@ -603,50 +583,45 @@ sub _expand_expr_hashpair { } 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') { - return $self->_expand_expr($v); - } - if ($k eq '-bool') { - if (ref($v)) { - return $self->_expand_expr($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; + } } - puke "-bool => undef not supported" unless defined($v); - return { -ident => $v }; - } - if ($k eq '-not') { - return { -not => $self->_expand_expr($v) }; + return $self->_expand_expr($v); } if (my ($rest) = $k =~/^-not[_ ](.*)$/) { - return +{ -not => - $self->_expand_expr_hashpair("-${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); - } + 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 - puke "Illegal use of top-level '-$op'" - if !(defined $self->{_nested_func_lhs}) + # 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}} - and not List::Util::first { $op =~ $_->{regex} } @{$self->{unary_ops}}; - } - if ($k eq '-value' and my $m = our $Cur_Col_Meta) { - return +{ -bind => [ $m, $v ] }; + ) { + puke "Illegal use of top-level '-$op'" + } + if (my $us = List::Util::first { $op =~ $_->{regex} } @{$self->{unary_ops}}) { + return { -op => [ $op, $v ] }; + } } - if ($k eq '-op' or $k eq '-ident' or $k eq '-value' or $k eq '-bind' or $k eq '-literal' or $k eq '-func') { + if ($self->{render}{$k}) { return { $k => $v }; } if ( @@ -655,6 +630,9 @@ sub _expand_expr_hashpair { 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)) { @@ -669,33 +647,38 @@ sub _expand_expr_hashpair { 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 }, - { -bind => [ $k, $v ] } + $self->_expand_ident(-ident => $k), + ($d + ? $self->_expand_expr($d => $v) + : { -bind => [ $k, $v ] } + ) ] }; } if (ref($v) eq 'HASH') { if (keys %$v > 1) { - return { -and => [ - map $self->_expand_expr_hashpair($k => { $_ => $v->{$_} }), + return { -op => [ + 'and', + 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; @@ -704,84 +687,89 @@ sub _expand_expr_hashpair { 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 +{ - -literal => [ $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 (! defined $vv or ref $vv) { - puke "-$vk requires a single plain scalar argument (a quotable identifier)"; + 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}, - { -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 +{ "-${vk}" => [ - map $self->_expand_expr_hashpair($k, { $_ => $vv->{$_} }), + return +{ -op => [ + $op, + map $self->_expand_expr({ $k, { $_ => $vv->{$_} } }), sort keys %$vv ] }; } } - if (my $us = List::Util::first { $vk =~ $_->{regex} } @{$self->{user_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 { $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) = ( @@ -790,12 +778,11 @@ sub _expand_expr_hashpair { : (-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)" ; @@ -803,16 +790,16 @@ sub _expand_expr_hashpair { } 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} - : $op =~ $self->{inequality_op} ? $self->{sqltrue} - : $op =~ $self->{not_like_op} ? belch("Supplying an empty arrayref to '@{[ uc $op]}' is deprecated") && $self->{sqltrue} + $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 +{ $logic => [ - map $self->_expand_expr_hashpair($k => { $vk => $_ }), + return +{ -op => [ + $logic =~ /^-(.*)$/, + map $self->_expand_expr({ $k => { $vk => $_ } }), @values ] }; } @@ -824,7 +811,6 @@ sub _expand_expr_hashpair { and not defined $vv->{-value} ) ) { - my $op = join ' ', split '_', $vk; my $is = $op =~ /^not$/i ? 'is not' # legacy : $op =~ $self->{equality_op} ? 'is' @@ -832,24 +818,26 @@ sub _expand_expr_hashpair { : $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; + 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 +{ "-${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) { @@ -859,361 +847,121 @@ sub _expand_expr_hashpair { my ($sql, @bind) = @$literal; if ($self->{bindtype} eq 'columns') { for (@bind) { - if (!defined $_ || ref($_) ne 'ARRAY' || @$_ != 2) { - puke "bindtype 'columns' selected, you need to pass: [column_name => bind_value]" - } + $self->_assert_bindval_matches_bindtype($_); } } return +{ -literal => [ $self->_quote($k).' '.$sql, @bind ] }; } - ::Ddie([ HUH => { $k => $v } ]); die "notreached"; - return { $k => $v }; } -sub _recurse_where { - my ($self, $where, $logic) = @_; - -#print STDERR Data::Dumper::Concise::Dumper([ $where, $logic ]); - - my $where_exp = $self->_expand_expr($where, $logic); - -#print STDERR Data::Dumper::Concise::Dumper([ EXP => $where_exp ]); - - # dispatch on appropriate method according to refkind of $where - my $method = $self->_METHOD_FOR_refkind("_where", $where_exp); - - my ($sql, @bind) = $self->$method($where_exp, $logic); - - # DBIx::Class used to call _recurse_where in scalar context - # something else might too... - if (wantarray) { - return ($sql, @bind); - } - else { - belch "Calling _recurse_where in scalar context is deprecated and will go away before 2.0"; - return $sql; +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 }; } - - -#====================================================================== -# WHERE: top-level ARRAYREF -#====================================================================== - - -sub _where_ARRAYREF { - my ($self, $where, $logic) = @_; - - $logic = uc($logic || $self->{logic}); - $logic eq 'AND' or $logic eq 'OR' or puke "unknown logic: $logic"; - - my @clauses = @$where; - - my (@sql_clauses, @all_bind); - # need to use while() so can shift() for pairs - while (@clauses) { - my $el = shift @clauses; - - $el = undef if (defined $el and ! length $el); - - # switch according to kind of $el and get corresponding ($sql, @bind) - my ($sql, @bind) = $self->_SWITCH_refkind($el, { - - # skip empty elements, otherwise get invalid trailing AND stuff - ARRAYREF => sub {$self->_recurse_where($el) if @$el}, - - ARRAYREFREF => sub { - my ($s, @b) = @$$el; - $self->_assert_bindval_matches_bindtype(@b); - ($s, @b); - }, - - HASHREF => sub {$self->_recurse_where($el, 'and') if %$el}, - - SCALARREF => sub { ($$el); }, - - SCALAR => sub { - # top-level arrayref with scalars, recurse in pairs - $self->_recurse_where({$el => shift(@clauses)}) - }, - - UNDEF => sub {puke "Supplying an empty left hand side argument is not supported in array-pairs" }, - }); - - if ($sql) { - push @sql_clauses, $sql; - push @all_bind, @bind; - } - } - - return $self->_join_sql_clauses($logic, \@sql_clauses, \@all_bind); +sub _expand_value { + +{ -bind => [ our $Cur_Col_Meta, $_[2] ] }; } -#====================================================================== -# WHERE: top-level ARRAYREFREF -#====================================================================== - -sub _where_ARRAYREFREF { - my ($self, $where) = @_; - my ($sql, @bind) = @$$where; - $self->_assert_bindval_matches_bindtype(@bind); - return ($sql, @bind); +sub _expand_not { + +{ -op => [ 'not', $_[0]->_expand_expr($_[2]) ] }; } -#====================================================================== -# WHERE: top-level HASHREF -#====================================================================== - -sub _where_HASHREF { - my ($self, $where) = @_; - my (@sql_clauses, @all_bind); - - for my $k (sort keys %$where) { - my $v = $where->{$k}; - - # ($k => $v) is either a special unary op or a regular hashpair - my ($sql, @bind) = do { - if ($k =~ /^-./) { - # put the operator in canonical form - my $op = $k; - $op = substr $op, 1; # remove initial dash - $op =~ s/^\s+|\s+$//g;# remove leading/trailing space - $op =~ s/\s+/ /g; # compress whitespace - - # so that -not_foo works correctly - $op =~ s/^not_/NOT /i; - - $self->_debug("Unary OP(-$op) within hashref, recursing..."); - my ($s, @b) = $self->_where_unary_op($op, $v); - - # top level vs nested - # we assume that handled unary ops will take care of their ()s - $s = "($s)" unless ( - List::Util::first {$op =~ $_->{regex}} @{$self->{unary_ops}} - or - ( defined $self->{_nested_func_lhs} and $self->{_nested_func_lhs} eq $k ) - ); - ($s, @b); - } - else { - if (! length $k) { - if (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'; - } - else { - puke "Supplying an empty left hand side argument is not supported in hash-pairs"; - } - } - - my $method = $self->_METHOD_FOR_refkind("_where_hashpair", $v); - $self->$method($k, $v); - } - }; - - push @sql_clauses, $sql; - push @all_bind, @bind; +sub _expand_bool { + my ($self, undef, $v) = @_; + if (ref($v)) { + return $self->_expand_expr($v); } - - return $self->_join_sql_clauses('and', \@sql_clauses, \@all_bind); + puke "-bool => undef not supported" unless defined($v); + return $self->_expand_ident(-ident => $v); } -sub _where_unary_op { - my ($self, $op, $rhs) = @_; - - $op =~ s/^-// if length($op) > 1; +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"; - # top level special ops are illegal in general - puke "Illegal use of top-level '-$op'" - if !(defined $self->{_nested_func_lhs}) - and List::Util::first { $op =~ $_->{regex} } @{$self->{special_ops}} - and not List::Util::first { $op =~ $_->{regex} } @{$self->{unary_ops}}; + my @expr = grep { + (ref($_) eq 'ARRAY' and @$_) + or (ref($_) eq 'HASH' and %$_) + or 1 + } @$v; - if (my $op_entry = List::Util::first { $op =~ $_->{regex} } @{$self->{unary_ops}}) { - my $handler = $op_entry->{handler}; + my @res; - if (not ref $handler) { - 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 ... ]"; + 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 $self->$handler($op, $rhs); - } - elsif (ref $handler eq 'CODE') { - return $handler->($self, $op, $rhs); - } - else { - puke "Illegal handler for operator $op - expecting a method name or a coderef"; } + # ??? + # return $res[0] if @res == 1; + return { -op => [ $logic, @res ] }; } - - $self->_debug("Generic unary OP: $op - recursing as function"); - - $self->_assert_pass_injection_guard($op); - - my ($sql, @bind) = $self->_SWITCH_refkind($rhs, { - SCALAR => sub { - puke "Illegal use of top-level '-$op'" - unless defined $self->{_nested_func_lhs}; - - return ( - $self->_convert('?'), - $self->_bindtype($self->{_nested_func_lhs}, $rhs) - ); - }, - FALLBACK => sub { - $self->_recurse_where($rhs) - }, - }); - - $sql = sprintf('%s %s', - $self->_sqlcase($op), - $sql, - ); - - 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) = @_; - - $self->_SWITCH_refkind($v, { - - SCALAR => sub { # permissively interpreted as SQL - belch "literal SQL should be -nest => \\'scalar' " - . "instead of -nest => 'scalar' "; - return ($v); - }, - - UNDEF => sub { - puke "-$op => undef not supported"; - }, - - FALLBACK => sub { - $self->_recurse_where($v); - }, - - }); + die "notreached"; } +sub _recurse_where { + my ($self, $where, $logic) = @_; -sub _where_op_BOOL { - my ($self, $op, $v) = @_; - - my ($s, @b) = $self->_SWITCH_refkind($v, { - SCALAR => sub { # interpreted as SQL column - $self->_convert($self->_quote($v)); - }, - - UNDEF => sub { - puke "-$op => undef not supported"; - }, - - FALLBACK => sub { - $self->_recurse_where($v); - }, - }); + # Special case: top level simple string treated as literal - $s = "(NOT $s)" if $op =~ /^not/i; - ($s, @b); -} + my $where_exp = (ref($where) + ? $self->_expand_expr($where, $logic) + : { -literal => [ $where ] }); + # dispatch expanded expression -sub _where_op_IDENT { - my $self = shift; - my ($op, $rhs) = splice @_, -2; - if (! defined $rhs or length ref $rhs) { - puke "-$op requires a single plain scalar argument (a quotable identifier)"; + my ($sql, @bind) = defined($where_exp) ? $self->render_aqt($where_exp) : (undef); + # DBIx::Class used to call _recurse_where in scalar context + # something else might too... + if (wantarray) { + return ($sql, @bind); } - - # in case we are called as a top level special op (no '=') - my $has_lhs = my $lhs = shift; - - $_ = $self->_convert($self->_quote($_)) for ($lhs, $rhs); - - return $has_lhs - ? "$lhs = $rhs" - : $rhs - ; -} - -sub _where_op_VALUE { - my $self = shift; - my ($op, $rhs) = splice @_, -2; - - # in case we are called as a top level special op (no '=') - my $lhs = shift; - - # special-case NULL - if (! defined $rhs) { - return defined $lhs - ? $self->_where_hashpair_HASHREF($lhs, { -is => undef }) - : undef - ; + else { + belch "Calling _recurse_where in scalar context is deprecated and will go away before 2.0"; + return $sql; } +} - my @bind = - $self->_bindtype( - (defined $lhs ? $lhs : $self->{_nested_func_lhs}), - $rhs, - ) - ; +sub _render_ident { + my ($self, $ident) = @_; - return $lhs - ? ( - $self->_convert($self->_quote($lhs)) . ' = ' . $self->_convert('?'), - @bind - ) - : ( - $self->_convert('?'), - @bind, - ) - ; + return $self->_convert($self->_quote($ident)); } - -my %unop_postfix = map +($_ => 1), 'is null', 'is not null'; +my %unop_postfix = map +($_ => 1), + 'is null', 'is not null', + 'asc', 'desc', +; my %special = ( (map +($_ => do { @@ -1227,14 +975,12 @@ my %special = ( unless $low->{-literal}; @{$low->{-literal}} } else { - local $self->{_nested_func_lhs} = $left->{-ident} - if ref($left) eq 'HASH' and $left->{-ident}; - my ($l, $h) = map [ $self->_where_unary_op(%$_) ], $low, $high; + 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->_recurse_where($left); + my ($lhsql, @lhbind) = $self->render_aqt($left); return ( join(' ', '(', $lhsql, $self->_sqlcase($op), $rhsql, ')'), @lhbind, @rhbind @@ -1248,13 +994,11 @@ my %special = ( 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_aqt($_); push @in_bind, @bind; $sql; } @$rhs; - my ($lhsql, @lbind) = $self->_recurse_where($lhs); + my ($lhsql, @lbind) = $self->render_aqt($lhs); return ( $lhsql.' '.$self->_sqlcase($op).' ( ' .join(', ', @in_sql) @@ -1265,478 +1009,81 @@ my %special = ( }), 'in', 'not in'), ); -sub _where_op_OP { - my ($self, undef, $v) = @_; +sub _render_op { + my ($self, $v) = @_; my ($op, @args) = @$v; $op =~ s/^-// if length($op) > 1; - local $self->{_nested_func_lhs}; + $op = lc($op); if (my $h = $special{$op}) { return $self->$h(\@args); } - if (my $us = List::Util::first { $op =~ $_->{regex} } @{$self->{user_special_ops}}) { + 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]); } + if (my $us = List::Util::first { $op =~ $_->{regex} } @{$self->{unary_ops}}) { + return $self->${\($us->{handler})}($op, $args[0]); + } my $final_op = $op =~ /^(?:is|not)_/ ? join(' ', split '_', $op) : $op; - if (@args == 1) { - my ($expr_sql, @bind) = $self->_recurse_where($args[0]); + if (@args == 1 and $op !~ /^(and|or)$/) { + my ($expr_sql, @bind) = $self->render_aqt($args[0]); my $op_sql = $self->_sqlcase($final_op); my $final_sql = ( $unop_postfix{lc($final_op)} ? "${expr_sql} ${op_sql}" : "${op_sql} ${expr_sql}" ); - return ($final_sql, @bind); - } elsif (@args == 2) { - my ($l, $r) = map [ $self->_recurse_where($_) ], @args; + return (($op eq 'not' || $us ? '('.$final_sql.')' : $final_sql), @bind); + } 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($final_op).' ', + map $_->[0], @parts + ); return ( - $l->[0].' '.$self->_sqlcase($final_op).' '.$r->[0], - @{$l}[1..$#$l], @{$r}[1..$#$r] + $final_sql, + map @{$_}[1..$#$_], @parts ); } die "unhandled"; } -sub _where_op_FUNC { - my ($self, undef, $rest) = @_; +sub _render_list { + my ($self, $list) = @_; + my @parts = grep length($_->[0]), map [ $self->render_aqt($_) ], @$list; + return join(', ', map $_->[0], @parts), map @{$_}[1..$#$_], @parts; +} + +sub _render_func { + my ($self, $rest) = @_; my ($func, @args) = @$rest; my @arg_sql; my @bind = map { my @x = @$_; push @arg_sql, shift @x; @x - } map [ $self->_recurse_where($_) ], @args; + } map [ $self->render_aqt($_) ], @args; return ($self->_sqlcase($func).'('.join(', ', @arg_sql).')', @bind); } -sub _where_op_BIND { - my ($self, undef, $bind) = @_; +sub _render_bind { + my ($self, $bind) = @_; return ($self->_convert('?'), $self->_bindtype(@$bind)); } -sub _where_op_LITERAL { - my ($self, undef, $literal) = @_; +sub _render_literal { + my ($self, $literal) = @_; $self->_assert_bindval_matches_bindtype(@{$literal}[1..$#$literal]); return @$literal; } -sub _where_hashpair_ARRAYREF { - my ($self, $k, $v) = @_; - - if (@$v) { - my @v = @$v; # need copy because of shift below - $self->_debug("ARRAY($k) means distribute over elements"); - - # put apart first element if it is an operator (-and, -or) - my $op = ( - (defined $v[0] && $v[0] =~ /^ - (?: AND|OR ) $/ix) - ? shift @v - : '' - ); - my @distributed = map { {$k => $_} } @v; - - if ($op) { - $self->_debug("OP($op) reinjected into the distributed array"); - unshift @distributed, $op; - } - - my $logic = $op ? substr($op, 1) : ''; - - return $self->_recurse_where(\@distributed, $logic); - } - else { - $self->_debug("empty ARRAY($k) means 0=1"); - return ($self->{sqlfalse}); - } -} - -sub _where_hashpair_HASHREF { - my ($self, $k, $v, $logic) = @_; - $logic ||= 'and'; - - local $self->{_nested_func_lhs} = defined $self->{_nested_func_lhs} - ? $self->{_nested_func_lhs} - : $k - ; - - my ($all_sql, @all_bind); - - for my $orig_op (sort keys %$v) { - my $val = $v->{$orig_op}; - - # put the operator in canonical form - my $op = $orig_op; - - # FIXME - we need to phase out dash-less ops - $op =~ s/^-//; # remove possible initial dash - $op =~ s/^\s+|\s+$//g;# remove leading/trailing space - $op =~ s/\s+/ /g; # compress whitespace - - $self->_assert_pass_injection_guard($op); - - # fixup is_not - $op =~ s/^is_not/IS NOT/i; - - # so that -not_foo works correctly - $op =~ s/^not_/NOT /i; - - # another retarded special case: foo => { $op => { -value => undef } } - if (ref $val eq 'HASH' and keys %$val == 1 and exists $val->{-value} and ! defined $val->{-value} ) { - $val = undef; - } - - my ($sql, @bind); - - # CASE: col-value logic modifiers - if ($orig_op =~ /^ \- (and|or) $/xi) { - ($sql, @bind) = $self->_where_hashpair_HASHREF($k, $val, $1); - } - # CASE: special operators like -in or -between - elsif (my $special_op = List::Util::first { $op =~ $_->{regex} } @{$self->{special_ops}}) { - my $handler = $special_op->{handler}; - if (! $handler) { - puke "No handler supplied for special operator $orig_op"; - } - elsif (not ref $handler) { - ($sql, @bind) = $self->$handler($k, $op, $val); - } - elsif (ref $handler eq 'CODE') { - ($sql, @bind) = $handler->($self, $k, $op, $val); - } - else { - puke "Illegal handler for special operator $orig_op - expecting a method name or a coderef"; - } - } - else { - $self->_SWITCH_refkind($val, { - - ARRAYREF => sub { # CASE: col => {op => \@vals} - ($sql, @bind) = $self->_where_field_op_ARRAYREF($k, $op, $val); - }, - - ARRAYREFREF => sub { # CASE: col => {op => \[$sql, @bind]} (literal SQL with bind) - my ($sub_sql, @sub_bind) = @$$val; - $self->_assert_bindval_matches_bindtype(@sub_bind); - $sql = join ' ', $self->_convert($self->_quote($k)), - $self->_sqlcase($op), - $sub_sql; - @bind = @sub_bind; - }, - - UNDEF => sub { # CASE: col => {op => undef} : sql "IS (NOT)? NULL" - 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 '$orig_op' with undef operand"; - - $sql = $self->_quote($k) . $self->_sqlcase(" $is null"); - }, - - FALLBACK => sub { # CASE: col => {op/func => $stuff} - ($sql, @bind) = $self->_where_unary_op($op, $val); - - $sql = join(' ', - $self->_convert($self->_quote($k)), - $self->{_nested_func_lhs} eq $k ? $sql : "($sql)", # top level vs nested - ); - }, - }); - } - - ($all_sql) = (defined $all_sql and $all_sql) ? $self->_join_sql_clauses($logic, [$all_sql, $sql], []) : $sql; - push @all_bind, @bind; - } - return ($all_sql, @all_bind); -} - -sub _where_field_IS { - my ($self, $k, $op, $v) = @_; - - my ($s) = $self->_SWITCH_refkind($v, { - UNDEF => sub { - join ' ', - $self->_convert($self->_quote($k)), - map { $self->_sqlcase($_)} ($op, 'null') - }, - FALLBACK => sub { - puke "$op can only take undef as argument"; - }, - }); - - $s; -} - -sub _where_field_op_ARRAYREF { - my ($self, $k, $op, $vals) = @_; - - my @vals = @$vals; #always work on a copy - - if (@vals) { - $self->_debug(sprintf '%s means multiple elements: [ %s ]', - $vals, - join(', ', map { defined $_ ? "'$_'" : 'NULL' } @vals ), - ); - - # see if the first element is an -and/-or op - my $logic; - if (defined $vals[0] && $vals[0] =~ /^ - (AND|OR) $/ix) { - $logic = uc $1; - shift @vals; - } - - # a long standing API wart - an attempt to change this behavior during - # the 1.50 series failed *spectacularly*. Warn instead and leave the - # behavior as is - if ( - @vals > 1 - and - (!$logic or $logic eq 'OR') - and - ($op =~ $self->{inequality_op} or $op =~ $self->{not_like_op}) - ) { - my $o = uc($op); - belch "A multi-element arrayref as an argument to the inequality op '$o' " - . 'is technically equivalent to an always-true 1=1 (you probably wanted ' - . "to say ...{ \$inequality_op => [ -and => \@values ] }... instead)" - ; - } - - # distribute $op over each remaining member of @vals, append logic if exists - return $self->_recurse_where([map { {$k => {$op, $_}} } @vals], $logic); - - } - else { - # 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')"; - } -} - - -sub _where_hashpair_SCALARREF { - my ($self, $k, $v) = @_; - $self->_debug("SCALAR($k) means literal SQL: $$v"); - my $sql = $self->_quote($k) . " " . $$v; - return ($sql); -} - -# literal SQL with bind -sub _where_hashpair_ARRAYREFREF { - my ($self, $k, $v) = @_; - $self->_debug("REF($k) means literal SQL: @${$v}"); - my ($sql, @bind) = @$$v; - $self->_assert_bindval_matches_bindtype(@bind); - $sql = $self->_quote($k) . " " . $sql; - return ($sql, @bind ); -} - -# literal SQL without bind -sub _where_hashpair_SCALAR { - my ($self, $k, $v) = @_; - $self->_debug("NOREF($k) means simple key=val: $k $self->{cmp} $v"); - return ($self->_where_hashpair_HASHREF($k, { $self->{cmp} => $v })); -} - - -sub _where_hashpair_UNDEF { - my ($self, $k, $v) = @_; - $self->_debug("UNDEF($k) means IS NULL"); - return $self->_where_hashpair_HASHREF($k, { -is => undef }); -} - -#====================================================================== -# WHERE: TOP-LEVEL OTHERS (SCALARREF, SCALAR, UNDEF) -#====================================================================== - - -sub _where_SCALARREF { - my ($self, $where) = @_; - - # literal sql - $self->_debug("SCALAR(*top) means literal SQL: $$where"); - return ($$where); -} - - -sub _where_SCALAR { - my ($self, $where) = @_; - - # literal sql - $self->_debug("NOREF(*top) means literal SQL: $where"); - return ($where); -} - - -sub _where_UNDEF { - my ($self) = @_; - return (); -} - - -#====================================================================== -# WHERE: BUILTIN SPECIAL OPERATORS (-in, -between) -#====================================================================== - - -sub _where_field_BETWEEN { - my ($self, $k, $op, $vals) = @_; - - my ($label, $and, $placeholder); - $label = $self->_convert($self->_quote($k)); - $and = ' ' . $self->_sqlcase('and') . ' '; - $placeholder = $self->_convert('?'); - $op = $self->_sqlcase($op); - - my $invalid_args = "Operator '$op' requires either an arrayref with two defined values or expressions, or a single literal scalarref/arrayref-ref"; - - my ($clause, @bind) = $self->_SWITCH_refkind($vals, { - ARRAYREFREF => sub { - my ($s, @b) = @$$vals; - $self->_assert_bindval_matches_bindtype(@b); - ($s, @b); - }, - SCALARREF => sub { - return $$vals; - }, - ARRAYREF => sub { - puke $invalid_args if @$vals != 2; - - my (@all_sql, @all_bind); - foreach my $val (@$vals) { - my ($sql, @bind) = $self->_SWITCH_refkind($val, { - SCALAR => sub { - return ($placeholder, $self->_bindtype($k, $val) ); - }, - SCALARREF => sub { - return $$val; - }, - ARRAYREFREF => sub { - my ($sql, @bind) = @$$val; - $self->_assert_bindval_matches_bindtype(@bind); - return ($sql, @bind); - }, - HASHREF => sub { - my ($func, $arg, @rest) = %$val; - puke "Only simple { -func => arg } functions accepted as sub-arguments to BETWEEN" - if (@rest or $func !~ /^ \- (.+)/x); - $self->_where_unary_op($1 => $arg); - }, - FALLBACK => sub { - puke $invalid_args, - }, - }); - push @all_sql, $sql; - push @all_bind, @bind; - } - - return ( - (join $and, @all_sql), - @all_bind - ); - }, - FALLBACK => sub { - puke $invalid_args, - }, - }); - - my $sql = "( $label $op $clause )"; - return ($sql, @bind) -} - - -sub _where_field_IN { - my ($self, $k, $op, $vals) = @_; - - # backwards compatibility: if scalar, force into an arrayref - $vals = [$vals] if defined $vals && ! ref $vals; - - my ($label) = $self->_convert($self->_quote($k)); - my ($placeholder) = $self->_convert('?'); - $op = $self->_sqlcase($op); - - my ($sql, @bind) = $self->_SWITCH_refkind($vals, { - ARRAYREF => sub { # list of choices - if (@$vals) { # nonempty list - my (@all_sql, @all_bind); - - for my $val (@$vals) { - my ($sql, @bind) = $self->_SWITCH_refkind($val, { - SCALAR => sub { - return ($placeholder, $val); - }, - SCALARREF => sub { - return $$val; - }, - ARRAYREFREF => sub { - my ($sql, @bind) = @$$val; - $self->_assert_bindval_matches_bindtype(@bind); - return ($sql, @bind); - }, - HASHREF => sub { - my ($func, $arg, @rest) = %$val; - puke "Only simple { -func => arg } functions accepted as sub-arguments to IN" - if (@rest or $func !~ /^ \- (.+)/x); - $self->_where_unary_op($1 => $arg); - }, - UNDEF => sub { - puke( - 'SQL::Abstract before v1.75 used to generate incorrect SQL when the ' - . "-$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)' - ); - }, - }); - push @all_sql, $sql; - push @all_bind, @bind; - } - - return ( - sprintf('%s %s ( %s )', - $label, - $op, - join(', ', @all_sql) - ), - $self->_bindtype($k, @all_bind), - ); - } - else { # empty list: some databases won't understand "IN ()", so DWIM - my $sql = ($op =~ /\bnot\b/i) ? $self->{sqltrue} : $self->{sqlfalse}; - return ($sql); - } - }, - - SCALARREF => sub { # literal SQL - my $sql = $self->_open_outer_paren($$vals); - return ("$label $op ( $sql )"); - }, - ARRAYREFREF => sub { # literal SQL with bind - my ($sql, @bind) = @$$vals; - $self->_assert_bindval_matches_bindtype(@bind); - $sql = $self->_open_outer_paren($sql); - return ("$label $op ( $sql )", @bind); - }, - - UNDEF => sub { - puke "Argument passed to the '$op' operator can not be undefined"; - }, - - FALLBACK => sub { - puke "special op $op requires an arrayref (or scalarref/arrayref-ref)"; - }, - }); - - return ($sql, @bind); -} - # Some databases (SQLite) treat col IN (1, 2) different from # col IN ( (1, 2) ). Use this to strip all outer parens while # adding them back in the corresponding method @@ -1772,85 +1119,74 @@ sub _open_outer_paren { # ORDER BY #====================================================================== -sub _order_by { +sub _expand_order_by { my ($self, $arg) = @_; - my (@sql, @bind); - for my $c ($self->_order_by_chunks($arg) ) { - $self->_SWITCH_refkind($c, { - SCALAR => sub { push @sql, $c }, - ARRAYREF => sub { push @sql, shift @$c; push @bind, @$c }, - }); - } + return unless defined($arg) and not (ref($arg) eq 'ARRAY' and !@$arg); - my $sql = @sql - ? sprintf('%s %s', - $self->_sqlcase(' order by'), - join(', ', @sql) - ) - : '' - ; + my $expander = sub { + my ($self, $dir, $expr) = @_; + my @to_expand = ref($expr) eq 'ARRAY' ? @$expr : $expr; + foreach my $arg (@to_expand) { + if ( + ref($arg) eq 'HASH' + and keys %$arg > 1 + and grep /^-(asc|desc)$/, keys %$arg + ) { + puke "ordering direction hash passed to order by must have exactly one key (-asc or -desc)"; + } + } + 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]); + }; - return wantarray ? ($sql, @bind) : $sql; + local @{$self->{expand}}{qw(-asc -desc)} = (($expander) x 2); + + return $self->$expander(undef, $arg); } -sub _order_by_chunks { +sub _order_by { my ($self, $arg) = @_; - return $self->_SWITCH_refkind($arg, { + return '' unless defined(my $expanded = $self->_expand_order_by($arg)); - ARRAYREF => sub { - map { $self->_order_by_chunks($_ ) } @$arg; - }, + my ($sql, @bind) = $self->render_aqt($expanded); - ARRAYREFREF => sub { - my ($s, @b) = @$$arg; - $self->_assert_bindval_matches_bindtype(@b); - [ $s, @b ]; - }, + return '' unless length($sql); - SCALAR => sub {$self->_quote($arg)}, + my $final_sql = $self->_sqlcase(' order by ').$sql; - UNDEF => sub {return () }, - - SCALARREF => sub {$$arg}, # literal SQL, no quoting - - HASHREF => sub { - # get first pair in hash - my ($key, $val, @rest) = %$arg; + return wantarray ? ($final_sql, @bind) : $final_sql; +} - return () unless $key; +# _order_by no longer needs to call this so doesn't but DBIC uses it. - if (@rest or not $key =~ /^-(desc|asc)/i) { - puke "hash passed to _order_by must have exactly one key (-desc or -asc)"; - } - - my $direction = $1; +sub _order_by_chunks { + my ($self, $arg) = @_; - my @ret; - for my $c ($self->_order_by_chunks($val)) { - my ($sql, @bind); + return () unless defined(my $expanded = $self->_expand_order_by($arg)); - $self->_SWITCH_refkind($c, { - SCALAR => sub { - $sql = $c; - }, - ARRAYREF => sub { - ($sql, @bind) = @$c; - }, - }); + return $self->_chunkify_order_by($expanded); +} - $sql = $sql . ' ' . $self->_sqlcase($direction); +sub _chunkify_order_by { + my ($self, $expanded) = @_; - push @ret, [ $sql, @bind]; - } + return grep length, $self->render_aqt($expanded) + if $expanded->{-ident} or @{$expanded->{-literal}||[]} == 1; - return @ret; - }, - }); + for ($expanded) { + if (ref() eq 'HASH' and my $l = $_->{-list}) { + return map $self->_chunkify_order_by($_), @$l; + } + return [ $self->render_aqt($_) ]; + } } - #====================================================================== # DATASOURCE (FOR NOW, JUST PLAIN TABLE OR LIST OF TABLES) #====================================================================== @@ -1858,11 +1194,9 @@ sub _order_by_chunks { sub _table { my $self = shift; my $from = shift; - $self->_SWITCH_refkind($from, { - ARRAYREF => sub {join ', ', map { $self->_quote($_) } @$from;}, - SCALAR => sub {$self->_quote($from)}, - SCALARREF => sub {$$from}, - }); + ($self->render_aqt( + $self->_expand_maybe_list_expr($from, undef, -ident) + ))[0]; } @@ -1870,15 +1204,37 @@ sub _table { # UTILITY FUNCTIONS #====================================================================== +sub _expand_maybe_list_expr { + my ($self, $expr, $logic, $default) = @_; + my $e = do { + if (ref($expr) eq 'ARRAY') { + return { -list => [ + map $self->expand_expr($_, $default), @$expr + ] } if @$expr > 1; + $expr->[0] + } else { + $expr + } + }; + return $self->expand_expr($e, $default); +} + # highly optimized, as it's called way too often sub _quote { # my ($self, $label) = @_; return '' unless defined $_[1]; return ${$_[1]} if ref($_[1]) eq 'SCALAR'; + puke 'Identifier cannot be hashref' if ref($_[1]) eq 'HASH'; - $_[0]->{quote_char} or - ($_[0]->_assert_pass_injection_guard($_[1]), return $_[1]); + unless ($_[0]->{quote_char}) { + if (ref($_[1]) eq 'ARRAY') { + return join($_[0]->{name_sep}||'.', @{$_[1]}); + } else { + $_[0]->_assert_pass_injection_guard($_[1]); + return $_[1]; + } + } my $qref = ref $_[0]->{quote_char}; my ($l, $r) = @@ -1889,9 +1245,21 @@ sub _quote { my $esc = $_[0]->{escape_char} || $r; # parts containing * are naturally unquoted - return join($_[0]->{name_sep}||'', map - +( $_ eq '*' ? $_ : do { (my $n = $_) =~ s/(\Q$esc\E|\Q$r\E)/$esc$1/g; $l . $n . $r } ), - ( $_[0]->{name_sep} ? split (/\Q$_[0]->{name_sep}\E/, $_[1] ) : $_[1] ) + return join( + $_[0]->{name_sep}||'', + map +( + $_ eq '*' + ? $_ + : do { (my $n = $_) =~ s/(\Q$esc\E|\Q$r\E)/$esc$1/g; $l . $n . $r } + ), + (ref($_[1]) eq 'ARRAY' + ? @{$_[1]} + : ( + $_[0]->{name_sep} + ? split (/\Q$_[0]->{name_sep}\E/, $_[1] ) + : $_[1] + ) + ) ); } @@ -1899,8 +1267,8 @@ sub _quote { # Conversion, if applicable sub _convert { #my ($self, $arg) = @_; - if ($_[0]->{convert}) { - return $_[0]->_sqlcase($_[0]->{convert}) .'(' . $_[1] . ')'; + if ($_[0]->{convert_where}) { + return $_[0]->_sqlcase($_[0]->{convert_where}) .'(' . $_[1] . ')'; } return $_[1]; }