has sqla => (
is => 'ro', init_arg => undef,
handles => [ qw(
- expand_expr expand_maybe_list_expr render_aqt join_query_parts
+ expand_expr render_aqt join_query_parts
) ],
);
clause_expanders => [
"select.from", '_expand_from_list',
'select.group_by'
- => sub { $_[0]->expand_maybe_list_expr($_[2], -ident) },
+ => sub { $_[0]->expand_expr({ -list => $_[2] }, -ident) },
'select.having'
=> sub { $_[0]->expand_expr($_[2]) },
'update.from' => '_expand_from_list',
my ($self, undef, $vv, $k) = @_;
my @vv = (ref($vv) eq 'ARRAY' ? @$vv : $vv);
my $ik = $self->expand_expr($k, -ident);
- return +{ -as => [ $ik, $self->expand_expr($vv[0], -alias) ] }
+ return +{ -as => [ $ik, $self->expand_expr($vv[0], -ident) ] }
if @vv == 1 and ref($vv[0]) eq 'HASH';
my @as = map $self->expand_expr($_, -ident), @vv;
- return { -as => [ $ik, { -alias => \@as } ] };
+ return { -as => [ $ik, $self->expand_expr({ -alias => \@as }) ] };
}
sub _render_as {
if (ref($args) eq 'HASH' and my $alias = $args->{-alias}) {
$args = $alias;
}
- +{ -alias => [
- map $self->expand_expr($_, -ident),
- ref($args) eq 'ARRAY' ? @{$args} : $args
- ]
- }
+ my @parts = map $self->expand_expr($_, -ident),
+ ref($args) eq 'ARRAY' ? @{$args} : $args;
+ return $parts[0] if @parts == 1;
+ return { -alias => \@parts };
}
sub _expand_with {
{ foo => { -as => 'bar' } }
# aqt
- { -as =>
- [
- { -ident => [ 'foo' ] },
- { -alias => [ { -ident => [ 'bar' ] } ] },
- ]
- }
+ { -as => [ { -ident => [ 'foo' ] }, { -ident => [ 'bar' ] } ] }
# query
foo AS bar
# aqt
{ -join => {
- from => { -as => [
- { -ident => [ 't1' ] },
- { -alias => [ { -ident => [ 'table_one' ] } ] },
- ] },
+ from =>
+ {
+ -as => [ { -ident => [ 't1' ] }, { -ident => [ 'table_one' ] } ]
+ },
on => { -op => [
'=', { -ident => [ 'table_one', 'x' ] },
{ -ident => [ 't2', 'x' ] },
# aqt
{ -join => {
- from => { -as => [
- { -ident => [ 't1' ] },
- { -alias => [ { -ident => [ 'table_one' ] } ] },
- ] },
+ from =>
+ {
+ -as => [ { -ident => [ 't1' ] }, { -ident => [ 'table_one' ] } ]
+ },
to => { -ident => [ 't2' ] },
type => undef,
using =>