$self->clause_renderer('select.setop' => sub {
my ($self, undef, $setop) = @_;
- $self->render_aqt($setop);
+ @{ $self->render_aqt($setop) };
});
$self->renderer($_ => sub {
my ($self, $setop, $args) = @_;
- $self->join_clauses(
+ $self->join_query_parts(
' '.$self->format_keyword(join '_', $setop, ($args->{type}||())).' ',
- map [ $self->render_aqt($_) ], @{$args->{queries}}
+ @{$args->{queries}}
);
}) for qw(union intersect except);
$self->clause_expander('select.with_recursive', $with_expander);
$self->clause_renderer('select.with' => sub {
my ($self, undef, $with) = @_;
- my $q_part = [ $self->join_clauses(', ',
+ my $q_part = [ $self->join_query_parts(', ',
map {
my ($alias, $query) = @$_;
- [ $self->join_clauses(' ',
- [ $self->_render_alias($alias) ],
- [ $self->format_keyword('as') ],
- [ $self->render_aqt($query) ],
+ [ $self->join_query_parts(' ',
+ $self->_render_alias($alias),
+ $self->format_keyword('as'),
+ $query,
) ]
} @{$with->{queries}}
) ];
- return $self->join_clauses(' ',
- [ $self->format_keyword(join '_', 'with', ($with->{type}||'')) ],
+ return $self->join_query_parts(' ',
+ $self->format_keyword(join '_', 'with', ($with->{type}||'')),
$q_part,
);
});
return $self;
}
-sub format_keyword { $_[0]->_sqlcase(join ' ', split '_', $_[1]) }
-
sub _expand_select_clause_from {
my ($self, undef, $from) = @_;
+(from => $self->_expand_from_list(undef, $from));
sub _render_from_list {
my ($self, undef, $list) = @_;
- return $self->join_clauses(', ', map [ $self->render_aqt($_) ], @$list);
+ return $self->join_query_parts(', ', @$list);
}
sub _render_join {
my ($self, undef, $args) = @_;
my @parts = (
- [ $self->render_aqt($args->{from}) ],
- [ $self->format_keyword(join '_', ($args->{type}||()), 'join') ],
- [ $self->render_aqt(
- map +($_->{-ident} || $_->{-as} ? $_ : { -row => [ $_ ] }), $args->{to}
- ) ],
+ $args->{from},
+ $self->format_keyword(join '_', ($args->{type}||()), 'join'),
+ (map +($_->{-ident} || $_->{-as} ? $_ : { -row => [ $_ ] }), $args->{to}),
($args->{on} ? (
- [ $self->format_keyword('on') ],
- [ $self->render_aqt($args->{on}) ],
+ $self->format_keyword('on') ,
+ $args->{on},
) : ()),
($args->{using} ? (
- [ $self->format_keyword('using') ],
- [ $self->render_aqt($args->{using}) ],
+ $self->format_keyword('using'),
+ $args->{using},
) : ()),
);
- return $self->join_clauses(' ', @parts);
+ return $self->join_query_parts(' ', @parts);
}
sub _expand_op_as {
sub _render_as {
my ($self, undef, $args) = @_;
my ($thing, @alias) = @$args;
- return $self->join_clauses(
+ return $self->join_query_parts(
' ',
- [ $self->render_aqt($thing) ],
- [ $self->format_keyword('as') ],
- [ $self->_render_alias(\@alias) ],
+ $self->render_aqt($thing),
+ $self->format_keyword('as'),
+ $self->_render_alias(\@alias),
);
}
my ($self, $args) = @_;
my ($as, @cols) = @$args;
return (@cols
- ? $self->join_clauses('',
- [ $self->render_aqt($as) ],
+ ? $self->join_query_parts('',
+ $as,
[ '(' ],
- [ $self->join_clauses(
+ [ $self->join_query_parts(
', ',
- map [ $self->render_aqt($_) ], @cols
+ @cols
) ],
[ ')' ],
)