use strict;
use warnings;
+use Module::Runtime ();
use Carp ();
use List::Util ();
use Scalar::Util ();
(map +($_ => '_expand_op_is'), ('is', 'is_not')),
ident => '_expand_ident',
value => '_expand_value',
+ func => '_expand_func',
};
$opt{expand_op} = {
',' => '_render_op_multop',
};
+ if ($opt{lazy_join_sql_parts}) {
+ my $mod = Module::Runtime::use_module('SQL::Abstract::Parts');
+ $opt{join_sql_parts} ||= sub { $mod->new(@_) };
+ }
+
+ $opt{join_sql_parts} ||= sub { join $_[0], @_[1..$#_] };
+
return bless \%opt, $class;
}
my $fields;
- my $v_aqt = do {
- if (is_literal_value($data)) {
- $self->expand_expr($data);
- } else {
- ($fields, my $values) = (
- ref($data) eq 'HASH' ?
- ([ sort keys %$data ], [ @{$data}{sort keys %$data} ])
- : (undef, $data)
- );
-
- # no names (arrayref) means can't generate bindtype
- !($fields) && $self->{bindtype} eq 'columns'
- && belch "can't do 'columns' bindtype when called with arrayref";
-
- +{ -row => [
- map {
- local our $Cur_Col_Meta = $fields->[$_];
- $self->_expand_insert_value($values->[$_])
- } 0..$#$values
- ] };
- }
- };
-
- my $f_aqt = (@$fields
- ? $self->expand_expr({ -row => $fields }, -ident)
- : undef
- );
+ my ($f_aqt, $v_aqt) = $self->_expand_insert_values($data);
my @parts = ([ $self->_sqlcase('insert into').' '.$table ]);
- push @parts, [ $self->render_aqt($f_aqt) ] if $f_aqt;
- push @parts, [ $self->render_aqt($v_aqt) ];
- $parts[-1][0] =~ s/^/VALUES /;
+ push @parts, $self->render_aqt($f_aqt) if $f_aqt;
+ push @parts, [ $self->_sqlcase('values') ], $self->render_aqt($v_aqt);
if ($options->{returning}) {
push @parts, [ $self->_insert_returning($options) ];
}
- my ($sql, @bind) = $self->_join_parts(' ', @parts);
-
+ my ($sql, @bind) = @{ $self->join_query_parts(' ', @parts) };
return wantarray ? ($sql, @bind) : $sql;
}
+sub _expand_insert_values {
+ my ($self, $data) = @_;
+ if (is_literal_value($data)) {
+ (undef, $self->expand_expr($data));
+ } else {
+ my ($fields, $values) = (
+ ref($data) eq 'HASH' ?
+ ([ sort keys %$data ], [ @{$data}{sort keys %$data} ])
+ : ([], $data)
+ );
+
+ # no names (arrayref) means can't generate bindtype
+ !($fields) && $self->{bindtype} eq 'columns'
+ && belch "can't do 'columns' bindtype when called with arrayref";
+
+ +(
+ (@$fields
+ ? $self->expand_expr({ -row => $fields }, -ident)
+ : undef
+ ),
+ +{ -row => [
+ map {
+ local our $Cur_Col_Meta = $fields->[$_];
+ $self->_expand_insert_value($values->[$_])
+ } 0..$#$values
+ ] },
+ );
+ }
+}
+
# So that subclasses can override INSERT ... RETURNING separately from
# UPDATE and DELETE (e.g. DBIx::Class::SQLMaker::Oracle does this)
sub _insert_returning { shift->_returning(@_) }
my $f = $options->{returning};
- my ($sql, @bind) = $self->render_aqt(
+ my ($sql, @bind) = @{ $self->render_aqt(
$self->_expand_maybe_list_expr($f, -ident)
- );
- return wantarray
- ? $self->_sqlcase(' returning ') . $sql
- : ($self->_sqlcase(' returning ').$sql, @bind);
+ ) };
+ return ($self->_sqlcase(' returning ').$sql, @bind);
}
sub _expand_insert_value {
sub _update_set_values {
my ($self, $data) = @_;
- return $self->render_aqt(
- $self->_expand_update_set_values($data),
- );
+ return @{ $self->render_aqt(
+ $self->_expand_update_set_values(undef, $data),
+ ) };
}
sub _expand_update_set_values {
- my ($self, $data) = @_;
+ my ($self, undef, $data) = @_;
$self->_expand_maybe_list_expr( [
map {
my ($k, $set) = @$_;
$set = { -bind => $_ } unless defined $set;
- +{ -op => [ '=', $self->_expand_ident(-ident => $k), $set ] };
+ +{ -op => [ '=', { -ident => $k }, $set ] };
}
map {
my $k = $_;
sub _select_fields {
my ($self, $fields) = @_;
return $fields unless ref($fields);
- return $self->render_aqt(
+ return @{ $self->render_aqt(
$self->_expand_maybe_list_expr($fields, '-ident')
- );
+ ) };
}
#======================================================================
die "No" if @rest;
die "Not a node type: $k" unless $k =~ s/^-//;
if (my $meth = $self->{render}{$k}) {
- return $self->$meth($v);
+ return $self->$meth($k, $v);
}
die "notreached: $k";
}
sub render_expr {
my ($self, $expr, $default_scalar_to) = @_;
- $self->render_aqt($self->expand_expr($expr, $default_scalar_to));
+ return @{ $self->render_aqt(
+ $self->expand_expr($expr, $default_scalar_to)
+ ) };
}
sub _normalize_op {
my ($self, $raw) = @_;
- s/^-(?=.)//, s/\s+/_/g for my $op = lc $raw;
+ my $op = lc $raw;
+ return $op if grep $_->{$op}, @{$self}{qw(is_op expand_op render_op)};
+ s/^-(?=.)//, s/\s+/_/g for $op;
$op;
}
}
puke "Supplying an empty left hand side argument is not supported";
}
- if ($k =~ /^-/) {
+ if ($k =~ /^-./) {
return $self->_expand_hashpair_op($k, $v);
+ } elsif ($k =~ /^[^\w]/i) {
+ my ($lhs, @rhs) = @$v;
+ return $self->_expand_op(
+ -op, [ $k, $self->expand_expr($lhs, -ident), @rhs ]
+ );
}
return $self->_expand_hashpair_ident($k, $v);
}
return { $k => $v };
}
- # hashref RHS values get expanded and used as op/func args
+ my $type = $self->{unknown_unop_always_func} ? -func : -op;
- 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
+ { # Old SQLA compat
- if (!ref($v) or is_literal_value($v)) {
- return +{ -op => [ $op, $self->_expand_expr($v) ] };
+ if (
+ ref($v) eq 'HASH'
+ and keys %$v == 1
+ and (keys %$v)[0] =~ /^-/
+ ) {
+ $type = (
+ (List::Util::first { $op =~ $_->{regex} } @{$self->{special_ops}})
+ ? -op
+ : -func
+ )
+ }
}
- die "notreached";
+ return +{ $type => [
+ $op,
+ ($type eq -func and ref($v) eq 'ARRAY')
+ ? map $self->_expand_expr($_), @$v
+ : $self->_expand_expr($v)
+ ] };
}
sub _expand_hashpair_cmp {
sub _expand_hashtriple {
my ($self, $k, $vk, $vv) = @_;
- my $ik = $self->_expand_ident(-ident => $k);
+ my $ik = $self->_expand_expr({ -ident => $k });
my $op = $self->_normalize_op($vk);
$self->_assert_pass_injection_guard($op);
if (ref($vv) eq 'ARRAY') {
my @raw = @$vv;
my $logic = (defined($raw[0]) and $raw[0] =~ /^-(and|or)$/i)
- ? (shift(@raw), $1) : 'or';
+ ? (shift(@raw), lc $1) : 'or';
my @values = map +{ $vk => $_ }, @raw;
if (
$op =~ $self->{inequality_op}
puke(sprintf $fail, $op);
}
+sub _expand_func {
+ my ($self, undef, $args) = @_;
+ my ($func, @args) = @$args;
+ return +{ -func => [ $func, map $self->expand_expr($_), @args ] };
+}
+
sub _expand_ident {
my ($self, undef, $body, $k) = @_;
return $self->_expand_hashpair_cmp(
return $self->_expand_expr($v);
}
puke "-bool => undef not supported" unless defined($v);
- return $self->_expand_ident(-ident => $v);
+ return $self->_expand_expr({ -ident => $v });
}
sub _expand_op_andor {
# dispatch expanded expression
- my ($sql, @bind) = defined($where_exp) ? $self->render_aqt($where_exp) : (undef);
+ my ($sql, @bind) = defined($where_exp) ? @{ $self->render_aqt($where_exp) || [] } : ();
# DBIx::Class used to call _recurse_where in scalar context
# something else might too...
if (wantarray) {
}
sub _render_ident {
- my ($self, $ident) = @_;
+ my ($self, undef, $ident) = @_;
- return $self->_convert($self->_quote($ident));
+ return [ $self->_convert($self->_quote($ident)) ];
}
sub _render_row {
- my ($self, $values) = @_;
- my ($sql, @bind) = $self->_render_op([ ',', @$values ]);
- return "($sql)", @bind;
+ my ($self, undef, $values) = @_;
+ return $self->join_query_parts('',
+ '(',
+ $self->_render_op(undef, [ ',', @$values ]),
+ ')'
+ );
}
sub _render_func {
- my ($self, $rest) = @_;
+ my ($self, undef, $rest) = @_;
my ($func, @args) = @$rest;
- my @arg_sql;
- my @bind = map {
- my @x = @$_;
- push @arg_sql, shift @x;
- @x
- } map [ $self->render_aqt($_) ], @args;
- return ($self->_sqlcase($func).'('.join(', ', @arg_sql).')', @bind);
+ return $self->join_query_parts('',
+ $self->_sqlcase($func),
+ $self->join_query_parts('',
+ '(',
+ $self->join_query_parts(', ', @args),
+ ')'
+ ),
+ );
}
sub _render_bind {
- my ($self, $bind) = @_;
- return ($self->_convert('?'), $self->_bindtype(@$bind));
+ my ($self, undef, $bind) = @_;
+ return [ $self->_convert('?'), $self->_bindtype(@$bind) ];
}
sub _render_literal {
- my ($self, $literal) = @_;
+ my ($self, undef, $literal) = @_;
$self->_assert_bindval_matches_bindtype(@{$literal}[1..$#$literal]);
- return @$literal;
+ return $literal;
}
sub _render_op {
- my ($self, $v) = @_;
+ my ($self, undef, $v) = @_;
my ($op, @args) = @$v;
if (my $r = $self->{render_op}{$op}) {
return $self->$r($op, \@args);
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->${\($ss->{handler})}($k, $op, $args[1]);
+ return [ $self->${\($ss->{handler})}($k, $op, $args[1]) ];
}
if (my $us = List::Util::first { $op =~ $_->{regex} } @{$self->{unary_ops}}) {
- return $self->${\($us->{handler})}($op, $args[0]);
+ return [ $self->${\($us->{handler})}($op, $args[0]) ];
}
if ($ss) {
return $self->_render_unop_paren($op, \@args);
sub _render_op_between {
my ($self, $op, $args) = @_;
my ($left, $low, $high) = @$args;
- my ($rhsql, @rhbind) = do {
+ my @rh = do {
if (@$args == 2) {
puke "Single arg to between must be a literal"
unless $low->{-literal};
- @{$low->{-literal}}
+ $low;
} else {
- my ($l, $h) = map [ $self->render_aqt($_) ], $low, $high;
- (join(' ', $l->[0], $self->_sqlcase('and'), $h->[0]),
- @{$l}[1..$#$l], @{$h}[1..$#$h])
+ +($low, $self->format_keyword('and'), $high);
}
};
- my ($lhsql, @lhbind) = $self->render_aqt($left);
- return (
- join(' ',
- '(', $lhsql,
- $self->_sqlcase(join ' ', split '_', $op),
- $rhsql, ')'
- ),
- @lhbind, @rhbind
+ return $self->join_query_parts(' ',
+ '(', $left, $self->format_keyword($op), @rh, ')',
);
}
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(join ' ', split '_', $op).' ( '
- .join(', ', @in_sql)
- .' )',
- @lbind, @in_bind
+
+ return $self->join_query_parts(' ',
+ $lhs,
+ $self->format_keyword($op),
+ $self->join_query_parts(' ',
+ '(',
+ $self->join_query_parts(', ', @rhs),
+ ')'
+ ),
);
}
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->_join_parts(' '.$self->_sqlcase($op).' ', @parts);
- return '( '.$sql.' )', @bind;
+ return undef unless @$args;
+ return $self->join_query_parts('', $args->[0]) if @$args == 1;
+ my $inner = $self->_render_op_multop($op, $args);
+ return undef unless defined($inner->[0]) and length($inner->[0]);
+ return $self->join_query_parts(' ',
+ '(', $inner, ')'
+ );
}
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 @parts = @$args;
+ return undef unless @parts;
+ return $self->render_aqt($parts[0]) if @parts == 1;
my $join = ($op eq ','
? ', '
- : ' '.$self->_sqlcase(join ' ', split '_', $op).' '
+ : ' '.$self->format_keyword($op).' '
);
- return $self->_join_parts($join, @parts);
+ return $self->join_query_parts($join, @parts);
}
-sub _join_parts {
+sub join_query_parts {
my ($self, $join, @parts) = @_;
- return (
- join($join, map $_->[0], @parts),
- map @{$_}[1..$#$_], @parts
- );
+ my @final = map +(
+ ref($_) eq 'HASH'
+ ? $self->render_aqt($_)
+ : ((ref($_) eq 'ARRAY') ? $_ : [ $_ ])
+ ), @parts;
+ return [
+ $self->{join_sql_parts}->($join, grep defined, map $_->[0], @final),
+ (map @{$_}[1..$#$_], @final),
+ ];
}
sub _render_unop_paren {
my ($self, $op, $v) = @_;
- my ($sql, @bind) = $self->_render_unop_prefix($op, $v);
- return "(${sql})", @bind;
+ return $self->join_query_parts('',
+ '(', $self->_render_unop_prefix($op, $v), ')'
+ );
}
sub _render_unop_prefix {
my ($self, $op, $v) = @_;
- my ($expr_sql, @bind) = $self->render_aqt($v->[0]);
-
- my $op_sql = $self->_sqlcase($op); # join ' ', split '_', $op);
- return ("${op_sql} ${expr_sql}", @bind);
+ return $self->join_query_parts(' ',
+ $self->_sqlcase($op), $v->[0]
+ );
}
sub _render_unop_postfix {
my ($self, $op, $v) = @_;
- my ($expr_sql, @bind) = $self->render_aqt($v->[0]);
- my $op_sql = $self->_sqlcase(join ' ', split '_', $op);
- return ($expr_sql.' '.$op_sql, @bind);
+ return $self->join_query_parts(' ',
+ $v->[0], $self->format_keyword($op),
+ );
}
# Some databases (SQLite) treat col IN (1, 2) different from
return unless defined($arg) and not (ref($arg) eq 'ARRAY' and !@$arg);
+ return $self->_expand_maybe_list_expr($arg)
+ if ref($arg) eq 'HASH' and ($arg->{-op}||[''])->[0] eq ',';
+
my $expander = sub {
my ($self, $dir, $expr) = @_;
my @to_expand = ref($expr) eq 'ARRAY' ? @$expr : $expr;
return '' unless defined(my $expanded = $self->_expand_order_by($arg));
- my ($sql, @bind) = $self->render_aqt($expanded);
+ 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;
+ return ($final_sql, @bind);
}
# _order_by no longer needs to call this so doesn't but DBIC uses it.
return () unless defined(my $expanded = $self->_expand_order_by($arg));
- return $self->_chunkify_order_by($expanded);
+ my @res = $self->_chunkify_order_by($expanded);
+ (ref() ? $_->[0] : $_) .= '' for @res;
+ return @res;
}
sub _chunkify_order_by {
my ($self, $expanded) = @_;
- return grep length, $self->render_aqt($expanded)
+ return grep length, @{ $self->render_aqt($expanded) }
if $expanded->{-ident} or @{$expanded->{-literal}||[]} == 1;
for ($expanded) {
my ($comma, @list) = @{$_->{-op}};
return map $self->_chunkify_order_by($_), @list;
}
- return [ $self->render_aqt($_) ];
+ return $self->render_aqt($_);
}
}
sub _table {
my $self = shift;
my $from = shift;
- ($self->render_aqt(
+ $self->render_aqt(
$self->_expand_maybe_list_expr($from, -ident)
- ))[0];
+ )->[0];
}
sub _expand_maybe_list_expr {
my ($self, $expr, $default) = @_;
+ return { -op => [
+ ',', map $self->expand_expr($_, $default),
+ @{$expr->{-op}}[1..$#{$expr->{-op}}]
+ ] } if ref($expr) eq 'HASH' and ($expr->{-op}||[''])->[0] eq ',';
return +{ -op => [ ',',
map $self->expand_expr($_, $default),
ref($expr) eq 'ARRAY' ? @$expr : $expr
# Conversion, if applicable
sub _convert {
#my ($self, $arg) = @_;
- if ($_[0]->{convert_where}) {
- return $_[0]->_sqlcase($_[0]->{convert_where}) .'(' . $_[1] . ')';
+ if (my $conv = $_[0]->{convert_where}) {
+ return @{ $_[0]->join_query_parts('',
+ $_[0]->format_keyword($conv),
+ '(' , $_[1] , ')'
+ ) };
}
return $_[1];
}
return $_[0]->{case} ? $_[1] : uc($_[1]);
}
+sub format_keyword { $_[0]->_sqlcase(join ' ', split '_', $_[1]) }
#======================================================================
# DISPATCHING FROM REFKIND
# This allows us to check for a local, then _form, attr
my $self = shift;
my($name) = $AUTOLOAD =~ /.*::(.+)/;
+ puke "AUTOLOAD invoked for method name ${name} and allow_autoload option not set" unless $self->{allow_autoload};
return $self->generate($name, @_);
}
projects / scpubgit/Q-Branch.git / blobdiff