X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FSQL%2FAbstract.pm;h=0ac8fdde3e2e9852b7c001d8701c1ef644110eb1;hb=7642d9ff9bcdacc503079a78cb85c4d44f0b2016;hp=ad843f60c18c4f74d6a9b407baaecb630d0802b0;hpb=b096cd688f919062454887ef4fce47bcc776ecac;p=dbsrgits%2FSQL-Abstract.git diff --git a/lib/SQL/Abstract.pm b/lib/SQL/Abstract.pm index ad843f6..0ac8fdd 100644 --- a/lib/SQL/Abstract.pm +++ b/lib/SQL/Abstract.pm @@ -155,10 +155,18 @@ 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} ||= []; @@ -176,6 +184,20 @@ 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', + }; + return bless \%opt, $class; } @@ -224,12 +246,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 @@ -295,50 +317,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); } @@ -381,59 +386,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 our $Cur_Col_Meta = $k; - my ($sql, @bind) = $self->_render_expr( - $self->_expand_expr_hashpair($op, $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 @@ -468,8 +447,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') + ); } #====================================================================== @@ -511,6 +492,8 @@ sub _delete_returning { shift->_returning(@_) } sub where { my ($self, $where, $order) = @_; + local $self->{convert_where} = $self->{convert}; + # where ? my ($sql, @bind) = defined($where) ? $self->_recurse_where($where) @@ -527,27 +510,56 @@ sub where { return wantarray ? ($sql, @bind) : $sql; } -sub _expand_expr { - my ($self, $expr, $logic, $default_scalar_to) = @_; +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 +{ -op => [ $logic, - map $self->_expand_expr_hashpair($_ => $expr->{$_}, $logic), + map $self->_expand_expr({ $_ => $expr->{$_} }, $logic), sort keys %$expr ] }; } - return unless %$expr; - return $self->_expand_expr_hashpair(%$expr, $logic); + my ($key, $value) = %$expr; + 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 @expr = grep { + (ref($_) eq 'ARRAY' and @$_) + or (ref($_) eq 'HASH' and %$_) + or 1 + } @$expr; my @res; @@ -556,30 +568,34 @@ sub _expand_expr { unless defined($el) and length($el); my $elref = ref($el); if (!$elref) { - push(@res, $self->_expand_expr({ $el, shift(@expr) })); + local $Expand_Depth = 0; + push(@res, grep defined, $self->_expand_expr({ $el, shift(@expr) })); } elsif ($elref eq 'ARRAY') { - push(@res, $self->_expand_expr($el)) if @$el; + 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') { - push @res, $self->_expand_expr($el); + local $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 ] }; } if (my $literal = is_literal_value($expr)) { return +{ -literal => $literal }; } if (!ref($expr) or Scalar::Util::blessed($expr)) { - if (my $d = $Default_Scalar_To) { - return +{ $d => $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 ] }; } die "notreached"; } @@ -600,22 +616,23 @@ sub _expand_expr_hashpair { . "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 { -op => [ 'not', $self->_expand_expr($v) ] }; + return $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) { @@ -629,26 +646,36 @@ sub _expand_expr_hashpair { { 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 List::Util::first { $op =~ $_->{regex} } @{$self->{special_ops}}; + # 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 ($k eq '-value' and my $m = our $Cur_Col_Meta) { - return +{ -bind => [ $m, $v ] }; + if (my $custom = $self->{expand_unary}{$k}) { + return $self->$custom($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 (my $custom = $self->{custom_expansions}{($k =~ /^-(.*)$/)[0]}) { - return $self->$custom($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)) { @@ -663,14 +690,18 @@ 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 ] } + ) ] }; } @@ -678,19 +709,19 @@ sub _expand_expr_hashpair { 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; @@ -699,83 +730,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 $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 +{ -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->{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) = ( @@ -784,12 +821,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)" ; @@ -797,7 +833,6 @@ 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 @@ -807,7 +842,7 @@ sub _expand_expr_hashpair { } return +{ -op => [ $logic =~ /^-(.*)$/, - map $self->_expand_expr_hashpair($k => { $vk => $_ }), + map $self->_expand_expr({ $k => { $vk => $_ } }), @values ] }; } @@ -819,7 +854,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' @@ -827,13 +861,13 @@ 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') { @@ -857,9 +891,7 @@ 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 ] }; @@ -867,34 +899,46 @@ sub _expand_expr_hashpair { die "notreached"; } -sub _render_expr { - my ($self, $expr) = @_; - my ($k, $v, @rest) = %$expr; - die "No" if @rest; - my %op = map +("-$_" => '_render_'.$_), - qw(op func value bind ident literal); - if (my $meth = $op{$k}) { - return $self->$meth($v); +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; } - die "notreached: $k"; + return +{ -ident => \@parts }; } -sub _recurse_where { - my ($self, $where, $logic) = @_; +sub _expand_value { + +{ -bind => [ our $Cur_Col_Meta, $_[2] ] }; +} -#print STDERR Data::Dumper::Concise::Dumper([ $where, $logic ]); +sub _expand_not { + +{ -op => [ 'not', $_[0]->_expand_expr($_[2]) ] }; +} - my $where_exp = $self->_expand_expr($where, $logic); +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); +} -#print STDERR Data::Dumper::Concise::Dumper([ EXP => $where_exp ]); +sub _recurse_where { + my ($self, $where, $logic) = @_; - # dispatch on appropriate method according to refkind of $where -# my $method = $self->_METHOD_FOR_refkind("_where", $where_exp); + # Special case: top level simple string treated as literal -# my ($sql, @bind) = $self->$method($where_exp, $logic); + my $where_exp = (ref($where) + ? $self->_expand_expr($where, $logic) + : { -literal => [ $where ] }); - my ($sql, @bind) = defined($where_exp) ? $self->_render_expr($where_exp) : (undef); + # dispatch expanded expression + 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) { @@ -912,12 +956,6 @@ sub _render_ident { return $self->_convert($self->_quote($ident)); } -sub _render_value { - my ($self, $value) = @_; - - return ($self->_convert('?'), $self->_bindtype(undef, $value)); -} - my %unop_postfix = map +($_ => 1), 'is null', 'is not null', 'asc', 'desc', @@ -935,12 +973,12 @@ my %special = ( unless $low->{-literal}; @{$low->{-literal}} } else { - my ($l, $h) = map [ $self->_render_expr($_) ], $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->_render_expr($left); + my ($lhsql, @lhbind) = $self->render_aqt($left); return ( join(' ', '(', $lhsql, $self->_sqlcase($op), $rhsql, ')'), @lhbind, @rhbind @@ -954,11 +992,11 @@ my %special = ( my ($lhs, $rhs) = @$args; my @in_bind; my @in_sql = map { - my ($sql, @bind) = $self->_render_expr($_); + my ($sql, @bind) = $self->render_aqt($_); push @in_bind, @bind; $sql; } @$rhs; - my ($lhsql, @lbind) = $self->_render_expr($lhs); + my ($lhsql, @lbind) = $self->render_aqt($lhs); return ( $lhsql.' '.$self->_sqlcase($op).' ( ' .join(', ', @in_sql) @@ -977,24 +1015,33 @@ sub _render_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 and $op !~ /^(and|or)$/) { - my ($expr_sql, @bind) = $self->_render_expr($args[0]); + 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 (($op eq 'not' ? '('.$final_sql.')' : $final_sql), @bind); + return (($op eq 'not' || $us ? '('.$final_sql.')' : $final_sql), @bind); } else { - my @parts = map [ $self->_render_expr($_) ], @args; - my ($final_sql) = map +($op =~ /^(and|or)$/ ? "(${_})" : $_), join( + 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 ); @@ -1006,6 +1053,12 @@ sub _render_op { die "unhandled"; } +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; @@ -1014,7 +1067,7 @@ sub _render_func { my @x = @$_; push @arg_sql, shift @x; @x - } map [ $self->_render_expr($_) ], @args; + } map [ $self->render_aqt($_) ], @args; return ($self->_sqlcase($func).'('.join(', ', @arg_sql).')', @bind); } @@ -1064,61 +1117,75 @@ sub _open_outer_paren { # ORDER BY #====================================================================== -sub _order_by { +sub _expand_order_by { my ($self, $arg) = @_; - return '' unless defined($arg) and not (ref($arg) eq 'ARRAY' and !@$arg); + return unless defined($arg) and not (ref($arg) eq 'ARRAY' and !@$arg); 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($_, undef, -ident), - ref($expr) eq 'ARRAY' ? @$expr : $expr; - return (@exp > 1 ? { -op => [ ',', @exp ] } : $exp[0]); + map $self->expand_expr($_, -ident), + map ref($_) eq 'ARRAY' ? @$_ : $_, @to_expand; + return (@exp > 1 ? { -list => \@exp } : $exp[0]); }; - local $self->{custom_expansions} = { - asc => sub { shift->$expander(asc => @_) }, - desc => sub { shift->$expander(desc => @_) }, - }; + local @{$self->{expand_unary}}{qw(-asc -desc)} = ( + sub { shift->$expander(asc => @_) }, + sub { shift->$expander(desc => @_) }, + ); - my $expanded = $self->$expander(undef, $arg); + return $self->$expander(undef, $arg); +} - my ($sql, @bind) = $self->_render_expr($expanded); +sub _order_by { + my ($self, $arg) = @_; + + return '' unless defined(my $expanded = $self->_expand_order_by($arg)); + + my ($sql, @bind) = $self->render_aqt($expanded); + + return '' unless length($sql); my $final_sql = $self->_sqlcase(' order by ').$sql; return wantarray ? ($final_sql, @bind) : $final_sql; } +# _order_by no longer needs to call this so doesn't but DBIC uses it. + sub _order_by_chunks { my ($self, $arg) = @_; - if (ref($arg) eq 'ARRAY') { - return map $self->_order_by_chunks($_), @$arg; - } - if (my $l = is_literal_value($arg)) { - return +{ -literal => $l }; - } - if (!ref($arg)) { - return +{ -ident => $arg }; - } - if (ref($arg) eq 'HASH') { - my ($key, $val, @rest) = %$arg; + return () unless defined(my $expanded = $self->_expand_order_by($arg)); - return () unless $key; + return $self->_chunkify_order_by($expanded); +} - if (@rest or not $key =~ /^-(desc|asc)/i) { - puke "hash passed to _order_by must have exactly one key (-desc or -asc)"; - } +sub _chunkify_order_by { + my ($self, $expanded) = @_; - my $dir = $1; + return grep length, $self->render_aqt($expanded) + if $expanded->{-ident} or @{$expanded->{-literal}||[]} == 1; - map +{ -op => [ $dir, $_ ] }, $self->_order_by_chunks($val); - }; + 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) #====================================================================== @@ -1126,11 +1193,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]; } @@ -1138,15 +1203,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) = @@ -1157,9 +1244,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] + ) + ) ); } @@ -1167,8 +1266,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]; }