(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 $fields;
- my $v_aqt = do {
- if (is_literal_value($data)) {
- $self->expand_expr($data);
- } else {
- ($fields, my $values) = (
- ref($data) eq 'HASH' ?
- ([ sort keys %$data ], [ @{$data}{sort keys %$data} ])
- : (undef, $data)
- );
-
- # no names (arrayref) means can't generate bindtype
- !($fields) && $self->{bindtype} eq 'columns'
- && belch "can't do 'columns' bindtype when called with arrayref";
-
- +{ -row => [
- map {
- local our $Cur_Col_Meta = $fields->[$_];
- $self->_expand_insert_value($values->[$_])
- } 0..$#$values
- ] };
- }
- };
-
- my $f_aqt = (@$fields
- ? $self->expand_expr({ -row => $fields }, -ident)
- : undef
- );
+ my ($f_aqt, $v_aqt) = $self->_expand_insert_values($data);
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) ];
}
- my ($sql, @bind) = $self->_join_parts(' ', @parts);
+ return $self->_join_parts(' ', @parts);
+}
- return wantarray ? ($sql, @bind) : $sql;
+sub _expand_insert_values {
+ my ($self, $data) = @_;
+ if (is_literal_value($data)) {
+ (undef, $self->expand_expr($data));
+ } else {
+ my ($fields, $values) = (
+ ref($data) eq 'HASH' ?
+ ([ sort keys %$data ], [ @{$data}{sort keys %$data} ])
+ : ([], $data)
+ );
+
+ # no names (arrayref) means can't generate bindtype
+ !($fields) && $self->{bindtype} eq 'columns'
+ && belch "can't do 'columns' bindtype when called with arrayref";
+
+ +(
+ (@$fields
+ ? $self->expand_expr({ -row => $fields }, -ident)
+ : undef
+ ),
+ +{ -row => [
+ map {
+ local our $Cur_Col_Meta = $fields->[$_];
+ $self->_expand_insert_value($values->[$_])
+ } 0..$#$values
+ ] },
+ );
+ }
}
# So that subclasses can override INSERT ... RETURNING separately from
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(
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 = @$_;
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 { -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