ident => '_expand_ident',
value => '_expand_value',
func => '_expand_func',
- values => '_expand_values',
};
$opt{expand_op} = {
};
$opt{render} = {
- (map +($_, "_render_$_"), qw(op func bind ident literal row values)),
+ (map +($_, "_render_$_"), qw(op func bind ident literal row)),
%{$opt{render}||{}}
};
my @parts = ([ $self->_sqlcase('insert into').' '.$table ]);
push @parts, [ $self->render_aqt($f_aqt) ] if $f_aqt;
- push @parts, [ $self->render_aqt({ -values => $v_aqt }) ];
+ push @parts, [ $self->_sqlcase('values') ], [ $self->render_aqt($v_aqt) ];
if ($options->{returning}) {
push @parts, [ $self->_insert_returning($options) ];
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 {
return { -bind => $bind };
}
-sub _expand_values {
- my ($self, undef, $values) = @_;
- return { -values => [
- map +(
- ref($_) eq 'HASH'
- ? $self->expand_expr($_)
- : +{ -row => [ map $self->expand_expr($_), @$_ ] }
- ), ref($values) eq 'ARRAY' ? @$values : $values
- ] };
-}
-
sub _recurse_where {
my ($self, $where, $logic) = @_;
return "($sql)", @bind;
}
-sub _render_values {
- my ($self, $values) = @_;
- my ($sql, @bind) = $self->_join_parts(
- ', ',
- map [ $self->render_aqt($_) ],
- ref($values) eq 'ARRAY' ? @$values : $values
- );
- return $self->_sqlcase('values ').$sql, @bind;
-}
-
sub _render_func {
my ($self, $rest) = @_;
my ($func, @args) = @$rest;