);
# set ops
- {
- my $orig = $self->expander('select');
- $self->expander(select => sub {
+ $self->wrap_expander(select => sub {
+ my $orig = shift;
+ sub {
my $self = shift;
my $exp = $self->$orig(@_);
return $exp unless my $setop = (my $sel = $exp->{-select})->{setop};
{ -select => \%inner };
}
return $exp;
- });
- }
+ }
+ });
my $expand_setop = sub {
my ($self, $setop, $args) = @_;
+{ "-${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' => my $with_expander = sub {
- my ($self, undef, $with) = @_;
+ my ($self, $name, $with) = @_;
+ my (undef, $type) = split '_', $name;
if (ref($with) eq 'HASH') {
return +{
%$with,
$self->expand_expr($query)
];
}
- return +{ queries => \@exp };
- });
- $self->clause_expander('select.with_recursive' => sub {
- my ($self, undef, $with) = @_;
- my $exp = $self->$with_expander(undef, $with);
- return +(with => +{
- %$exp,
- type => 'recursive'
- });
+ return +(with => { ($type ? (type => $type) : ()), queries => \@exp });
});
+ $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->join_query_parts(' ',
[ $self->_render_alias($alias) ],
[ $self->format_keyword('as') ],
- [ $self->render_aqt($query) ],
+ $query,
) ]
} @{$with->{queries}}
) ];
- return $self->join_clauses(' ',
+ 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 {
[ $self->render_aqt($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') ],
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
) ],
[ ')' ],
)