(map +($_ => '_expand_op_is'), ('is', 'is_not')),
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)),
+ (map +($_, "_render_$_"), qw(op func bind ident literal row values)),
%{$opt{render}||{}}
};
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({ -values => $v_aqt }) ];
if ($options->{returning}) {
push @parts, [ $self->_insert_returning($options) ];
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 +{ -op => [ $func, $self->_expand_expr($v) ] };
}
}
- return +{ -func => [ $func, $self->_expand_expr($v) ] };
+ return +{ -func => [
+ $func,
+ map $self->_expand_expr($_),
+ ref($v) eq 'ARRAY' ? @$v : $v
+ ] };
}
# scalars and literals get simply expanded
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 { -bind => $bind };
}
+sub _expand_values {
+ my ($self, undef, $values) = @_;
+ return { -values => [
+ map +(
+ ref($_) eq 'HASH'
+ ? $_
+ : +{ -row => [ map $self->expand_expr($_), @$_ ] }
+ ), @$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;
+ if (ref($func) eq 'HASH') {
+ $func = $self->render_aqt($func);
+ }
my @arg_sql;
my @bind = map {
my @x = @$_;