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->_sqlcase('values') ], [ $self->render_aqt($v_aqt) ];
if ($options->{returning}) {
push @parts, [ $self->_insert_returning($options) ];
}
- return $self->_join_parts(' ', @parts);
+ return $self->join_query_parts(' ', @parts);
}
sub _expand_insert_values {
my ($self, $data) = @_;
return $self->render_aqt(
- $self->_expand_update_set_values($data),
+ $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) = @$_;
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";
}
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,
- map $self->_expand_expr($_),
- ref($v) eq 'ARRAY' ? @$v : $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 _render_ident {
- my ($self, $ident) = @_;
+ my ($self, undef, $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) = @_;
+ my ($sql, @bind) = $self->_render_op(undef, [ ',', @$values ]);
+ return $self->join_query_parts('', [ '(' ], [ $sql, @bind ], [ ')' ]);
}
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(', ', @args) ],
+ [ ')' ]
+ );
}
sub _render_bind {
- my ($self, $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;
}
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);
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->_sqlcase('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->_sqlcase(join ' ', split '_', $op) ],
+ @rh,
+ [ ')' ],
);
}
sub _render_op_andor {
my ($self, $op, $args) = @_;
- my @parts = grep length($_->[0]), map [ $self->render_aqt($_) ], @$args;
+ my @parts = map [ $self->render_aqt($_) ], @$args;
return '' unless @parts;
return @{$parts[0]} if @parts == 1;
- my ($sql, @bind) = $self->_join_parts(' '.$self->_sqlcase($op).' ', @parts);
+ my ($sql, @bind) = $self->join_query_parts(' '.$self->_sqlcase($op).' ', @parts);
return '( '.$sql.' )', @bind;
}
sub _render_op_multop {
my ($self, $op, $args) = @_;
- my @parts = grep length($_->[0]), map [ $self->render_aqt($_) ], @$args;
+ my @parts = map [ $self->render_aqt($_) ], @$args;
return '' unless @parts;
return @{$parts[0]} if @parts == 1;
my $join = ($op eq ','
? ', '
: ' '.$self->_sqlcase(join ' ', split '_', $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) = @_;
+ my @final = map +(ref($_) eq 'HASH' ? [ $self->render_aqt($_) ] : $_),
+ @parts;
return (
- join($join, map $_->[0], @parts),
- (wantarray ? (map @{$_}[1..$#$_], @parts) : ()),
+ join($join, map $_->[0], @final),
+ (wantarray ? (map @{$_}[1..$#$_], @final) : ()),
);
}
return $_[0]->{case} ? $_[1] : uc($_[1]);
}
+sub format_keyword { $_[0]->_sqlcase(join ' ', split '_', $_[1]) }
#======================================================================
# DISPATCHING FROM REFKIND