(map +($_ => '_expand_op_is'), ('is', 'is_not')),
ident => '_expand_ident',
value => '_expand_value',
+ func => '_expand_func',
};
$opt{expand_op} = {
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_clauses(' ', @parts);
}
sub _expand_insert_values {
if ($k =~ /^-/) {
return $self->_expand_hashpair_op($k, $v);
} elsif ($k =~ /^[^\w]/i) {
- return $self->_expand_op(-op, [ $k, @$v ]);
+ 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 {
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(
sub _render_func {
my ($self, $rest) = @_;
my ($func, @args) = @$rest;
+ if (ref($func) eq 'HASH') {
+ $func = $self->render_aqt($func);
+ }
my @arg_sql;
my @bind = map {
my @x = @$_;
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);
+ my ($sql, @bind) = $self->join_clauses(' '.$self->_sqlcase($op).' ', @parts);
return '( '.$sql.' )', @bind;
}
? ', '
: ' '.$self->_sqlcase(join ' ', split '_', $op).' '
);
- return $self->_join_parts($join, @parts);
+ return $self->join_clauses($join, @parts);
}
-sub _join_parts {
+sub join_clauses {
my ($self, $join, @parts) = @_;
return (
join($join, map $_->[0], @parts),