$self->{expand_clause}{'update.update'} = '_expand_update_clause_target';
$self->{render_clause}{'update.target'} = sub {
my ($self, undef, $target) = @_;
- my ($sql, @bind) = $self->render_aqt($target);
- ($self->_sqlcase('update ').$sql, @bind);
+ $self->join_query_parts(' ', $self->format_keyword('update'), $target);
};
$self->{clauses_of}{delete} = [ qw(target where returning) ];
$self->{expand}{delete} = sub { shift->_expand_statement(@_) };
$self->{expand_clause}{"delete.from"} = '_expand_delete_clause_target';
$self->{render_clause}{'delete.target'} = sub {
my ($self, undef, $from) = @_;
- my ($sql, @bind) = $self->render_aqt($from);
- ($self->_sqlcase('delete from ').$sql, @bind);
+ $self->join_query_parts(' ', $self->format_keyword('delete from'), $from);
};
$self->{clauses_of}{insert} = [
'target', 'fields', 'from', 'returning'
];
$self->{expand}{insert} = sub { shift->_expand_statement(@_) };
$self->{render}{insert} = sub { shift->_render_statement(@_) };
+ $self->{expand_clause}{"insert.$_"} = "_expand_insert_clause_$_"
+ for @{$self->{clauses_of}{insert}};
$self->{expand_clause}{'insert.into'} = '_expand_insert_clause_target';
- $self->{expand_clause}{'insert.target'} = '_expand_insert_clause_target';
- $self->{expand_clause}{'insert.fields'} = sub {
- return +{ -row => [
- shift->_expand_maybe_list_expr($_[2], -ident)
- ] } if ref($_[2]) eq 'ARRAY';
- return $_[2]; # should maybe still expand somewhat?
- };
- $self->{expand_clause}{'insert.values'} = '_expand_insert_clause_values';
- $self->{expand_clause}{'insert.returning'} = sub {
- shift->_expand_maybe_list_expr(@_, -ident);
- };
+ $self->{expand_clause}{'insert.values'} = '_expand_insert_clause_from';
$self->{render_clause}{'insert.fields'} = sub {
- return $_[0]->render_aqt($_[2]);
+ return @{ $_[0]->render_aqt($_[2]) };
};
$self->{render_clause}{'insert.target'} = sub {
my ($self, undef, $from) = @_;
- my ($sql, @bind) = $self->render_aqt($from);
- ($self->_sqlcase('insert into ').$sql, @bind);
+ $self->join_query_parts(' ', $self->format_keyword('insert into'), $from);
};
$self->{render_clause}{'insert.from'} = sub {
- return $_[0]->render_aqt($_[2], 1);
+ return @{ $_[0]->render_aqt($_[2], 1) };
};
$self->{expand}{values} = '_expand_values';
$self->{render}{values} = '_render_values';
$self->{expand}{exists} = sub {
$_[0]->_expand_op(undef, [ exists => $_[2] ]);
};
+ $self->{render}{convert_where} = sub {
+ my $self = shift;
+ local $self->{convert_where} = $self->{convert};
+ @{ $self->render_aqt($_[1]) };
+ };
return $self;
}
sub _expand_select_clause_where {
my ($self, undef, $where) = @_;
- +(where => $self->expand_expr($where));
+ my $exp = $self->expand_expr($where);
+ +(where => ($self->{convert} ? +{ -convert_where => $exp } : $exp));
}
sub _expand_select_clause_order_by {
my @parts;
foreach my $clause (@{$self->{clauses_of}{$type}}) {
next unless my $clause_expr = $args->{$clause};
- local $self->{convert_where} = $self->{convert} if $clause eq 'where';
- my ($sql) = my @part = do {
+ my @part = do {
if (my $rdr = $self->{render_clause}{"${type}.${clause}"}) {
$self->$rdr($clause, $clause_expr);
} else {
- my ($clause_sql, @bind) = $self->render_aqt($clause_expr, 1);
+ my ($clause_sql, @bind) = @{ $self->render_aqt($clause_expr, 1) };
my $sql = join ' ',
$self->_sqlcase(join ' ', split '_', $clause),
$clause_sql;
($sql, @bind);
}
};
- next unless defined($sql) and length($sql);
push @parts, \@part;
}
- my ($sql, @bind) = $self->join_clauses(' ', @parts);
+ my ($sql, @bind) = $self->join_query_parts(' ', @parts);
return (
(our $Render_Top_Level ? $sql : '('.$sql.')'),
@bind
sub render_statement {
my ($self, $expr, $default_scalar_to) = @_;
- my ($sql, @bind) = $self->render_aqt(
+ my ($sql, @bind) = @{ $self->render_aqt(
$self->expand_expr($expr, $default_scalar_to), 1
- );
+ ) };
return (wantarray ? ($sql, @bind) : $sql);
}
+(target => $_[0]->_expand_maybe_list_expr($_[2], -ident));
}
-sub _expand_insert_clause_values {
+sub _expand_insert_clause_fields {
+ return +{ -row => [
+ $_[0]->_expand_maybe_list_expr($_[2], -ident)
+ ] } if ref($_[2]) eq 'ARRAY';
+ return $_[2]; # should maybe still expand somewhat?
+}
+
+sub _expand_insert_clause_from {
my ($self, undef, $data) = @_;
if (ref($data) eq 'HASH' and (keys(%$data))[0] =~ /^-/) {
return $self->expand_expr($data);
return (from => { -values => $v_aqt }, ($f_aqt ? (fields => $f_aqt) : ()));
}
+sub _expand_insert_clause_returning {
+ +(returning => $_[0]->_expand_maybe_list_expr($_[2], -ident));
+}
+
sub _expand_values {
my ($self, undef, $values) = @_;
return { -values => [
sub _render_values {
my ($self, undef, $values) = @_;
- my ($v_sql, @bind) = $self->join_clauses(
- ', ',
- map [ $self->render_aqt($_) ],
- ref($values) eq 'ARRAY' ? @$values : $values
- );
- my $sql = $self->_sqlcase('values').' '.$v_sql;
- return (
- (our $Render_Top_Level ? $sql : '('.$sql.')'),
- @bind
+ my $inner = [
+ $self->join_query_parts(' ',
+ $self->format_keyword('values'),
+ [ $self->join_query_parts(', ',
+ ref($values) eq 'ARRAY' ? @$values : $values
+ ) ],
+ ),
+ ];
+ return $self->join_query_parts('',
+ (our $Render_Top_Level ? $inner : ('(', $inner, ')'))
);
}