(map +($_ => '_expand_op_is'), ('is', 'is_not')),
ident => '_expand_ident',
value => '_expand_value',
+ func => '_expand_func',
};
$opt{expand_op} = {
push @parts, [ $self->_insert_returning($options) ];
}
- my ($sql, @bind) = $self->_join_parts(' ', @parts);
-
- return wantarray ? ($sql, @bind) : $sql;
+ return $self->_join_parts(' ', @parts);
}
sub _expand_insert_values {
sub render_expr {
my ($self, $expr, $default_scalar_to) = @_;
- $self->render_aqt($self->expand_expr($expr, $default_scalar_to));
+ my ($sql, @bind) = $self->render_aqt(
+ $self->expand_expr($expr, $default_scalar_to)
+ );
+ return (wantarray ? ($sql, @bind) : $sql);
}
sub _normalize_op {
}
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 +{ -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(
my ($self, $join, @parts) = @_;
return (
join($join, map $_->[0], @parts),
- map @{$_}[1..$#$_], @parts
+ (wantarray ? (map @{$_}[1..$#$_], @parts) : ()),
);
}
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;
sub _expand_maybe_list_expr {
my ($self, $expr, $default) = @_;
- return $expr if ref($expr) eq 'HASH' and (($expr->{-op}||[''])->[0] eq ',');
+ 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