}
push @list, $aqt;
}
+ return $list[0] if @list == 1;
return { -from_list => \@list };
}
: (to => @$args)
);
if (my $as = delete $proto{as}) {
- $proto{to} = $self->expand_expr({ -as => [ $proto{to}, $as ] });
+ $proto{to} = $self->expand_expr(
+ { -as => [ { -from_list => $proto{to} }, $as ] }
+ );
}
if (defined($proto{using}) and ref(my $using = $proto{using}) ne 'HASH') {
$proto{using} = [
ref($using) eq 'ARRAY' ? @$using: $using
];
}
- my %ret = map +($_ => $self->expand_expr($proto{$_}, -ident)),
- sort keys %proto;
- $ret{type} = $proto{type};
+ my %ret = (
+ type => delete $proto{type},
+ to => $self->expand_expr({ -from_list => delete $proto{to} }, -ident)
+ );
+ %ret = (%ret,
+ map +($_ => $self->expand_expr($proto{$_}, -ident)),
+ sort keys %proto
+ );
return +{ -join => \%ret };
}
my @parts = (
$args->{from},
{ -keyword => join '_', ($args->{type}||()), 'join' },
- (map +($_->{-ident} || $_->{-as} ? $_ : ('(', $_, ')')), $args->{to}),
+ (map +($_->{-ident} || $_->{-as}
+ ? $_
+ : ('(', $self->render_aqt($_, 1), ')')),
+ map +(@{$_->{-from_list}||[]} == 1 ? $_->{-from_list}[0] : $_),
+ $args->{to}
+ ),
($args->{on} ? (
{ -keyword => 'on' },
$args->{on},
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
- { -from_list => [ { -join => {
- from => { -as => [
- { -ident => [ 't1' ] },
- { -alias => [ { -ident => [ 'table_one' ] } ] },
- ] },
- on => { -op => [
- '=', { -ident => [ 'table_one', 'x' ] },
- { -ident => [ 't2', 'x' ] },
- ] },
- to => { -ident => [ 't2' ] },
- type => undef,
- } } ] }
+ { -join => {
+ from =>
+ {
+ -as => [ { -ident => [ 't1' ] }, { -ident => [ 'table_one' ] } ]
+ },
+ on => { -op => [
+ '=', { -ident => [ 'table_one', 'x' ] },
+ { -ident => [ 't2', 'x' ] },
+ ] },
+ to => { -ident => [ 't2' ] },
+ type => undef,
+ } }
# query
t1 AS table_one JOIN t2 ON table_one.x = t2.x
}
# aqt
- { -from_list => [ { -join => {
- from => { -as => [
- { -ident => [ 't1' ] },
- { -alias => [ { -ident => [ 'table_one' ] } ] },
- ] },
- to => { -ident => [ 't2' ] },
- type => undef,
- using =>
- {
- -op => [ 'or', { -op => [ 'or', { -ident => [ 'x' ] } ] } ]
- },
- } } ] }
+ { -join => {
+ from =>
+ {
+ -as => [ { -ident => [ 't1' ] }, { -ident => [ 'table_one' ] } ]
+ },
+ to => { -ident => [ 't2' ] },
+ type => undef,
+ using =>
+ { -op => [ 'or', { -op => [ 'or', { -ident => [ 'x' ] } ] } ] },
+ } }
# query
t1 AS table_one JOIN t2 USING ( x )
# expr
{ -from_list => [
- 'x', -join => [
- { -join => { from => 'y', to => 'z', type => 'left' } }, 'type',
- 'left',
- ],
+ 'x', -join =>
+ [ [ 'y', -join => [ 'z', 'type', 'left' ] ], 'type', 'left' ],
] }
# aqt
- { -from_list => [ { -join => {
- from => { -ident => [ 'x' ] },
- to => { -join => {
- from => { -ident => [ 'y' ] },
- to => { -ident => [ 'z' ] },
- type => 'left',
- } },
+ { -join => {
+ from => { -ident => [ 'x' ] },
+ to => { -join => {
+ from => { -ident => [ 'y' ] },
+ to => { -ident => [ 'z' ] },
type => 'left',
- } } ] }
+ } },
+ type => 'left',
+ } }
# query
x LEFT JOIN ( y LEFT JOIN z )