has sqla => (
is => 'ro', init_arg => undef,
handles => [ qw(
- expand_expr expand_maybe_list_expr render_aqt
- format_keyword join_query_parts
+ expand_expr expand_maybe_list_expr render_aqt join_query_parts
) ],
);
-BEGIN { *puke = \&SQL::Abstract::puke }
-
sub cb {
- my ($self, $method) = @_;
- return sub { local $self->{sqla} = shift; $self->$method(@_) };
+ my ($self, $method, @args) = @_;
+ return sub {
+ local $self->{sqla} = shift;
+ $self->$method(@args, @_)
+ };
}
sub apply_to {
$sqla->op_expander(as => $self->cb('_expand_op_as'));
$sqla->expander(as => $self->cb('_expand_op_as'));
$sqla->renderer(as => $self->cb('_render_as'));
- $sqla->expander(alias => $self->cb(sub {
- my ($self, undef, $args) = @_;
- if (ref($args) eq 'HASH' and my $alias = $args->{-alias}) {
- $args = $alias;
- }
- +{ -alias => [
- map $self->expand_expr($_, -ident),
- ref($args) eq 'ARRAY' ? @{$args} : $args
- ]
- }
- }));
+ $sqla->expander(alias => $self->cb('_expand_alias'));
$sqla->renderer(alias => $self->cb('_render_alias'));
$sqla->clauses_of(update => sub {
});
$sqla->clause_expanders(
- 'update.from' => $self->cb('_expand_select_clause_from'),
- 'delete.using' => $self->cb(sub {
- +(using => $_[0]->_expand_from_list(undef, $_[2]));
- }),
+ 'update.from' => $self->cb('_expand_from_list'),
+ 'delete.using' => $self->cb('_expand_from_list'),
'insert.rowvalues' => $self->cb(sub {
+(from => $_[0]->expand_expr({ -values => $_[2] }));
}),
# set ops
$sqla->wrap_expander(select => sub {
- my $orig = shift;
- $self->cb(sub {
- my $self = shift;
- my $exp = $self->sqla->$orig(@_);
- return $exp unless my $setop = (my $sel = $exp->{-select})->{setop};
- if (my @keys = grep $sel->{$_}, @before_setop) {
- my %inner; @inner{@keys} = delete @{$sel}{@keys};
- unshift @{(values(%$setop))[0]{queries}},
- { -select => \%inner };
- }
- return $exp;
- });
+ $self->cb('_expand_select', $_[0], \@before_setop);
});
- my $expand_setop = $self->cb(sub {
- my ($self, $setop, $args) = @_;
- +{ "-${setop}" => {
- %$args,
- queries => [ map $self->expand_expr($_), @{$args->{queries}} ],
- } };
- });
- $sqla->expanders(map +($_ => $expand_setop), qw(union intersect except));
- $sqla->clause_renderer('select.setop' => $self->cb(sub {
- my ($self, undef, $setop) = @_;
- $self->render_aqt($setop);
- }));
+ $sqla->clause_renderer(
+ 'select.setop' => $self->cb(sub { $_[0]->render_aqt($_[2]); })
+ );
- $sqla->renderer($_ => $self->cb(sub {
- my ($self, $setop, $args) = @_;
- $self->join_query_parts(
- ' '.$self->format_keyword(join '_', $setop, ($args->{type}||())).' ',
- @{$args->{queries}}
- );
- })) for qw(union intersect except);
-
- my $setop_expander = $self->cb(sub {
- my ($self, $setop, $args) = @_;
- my ($op, $type) = split '_', $setop;
- +(setop => $self->expand_expr({
- "-${op}" => {
- ($type ? (type => $type) : ()),
- queries => (ref($args) eq 'ARRAY' ? $args : [ $args ])
- }
- }));
- });
+ foreach my $setop (qw(union intersect except)) {
+ $sqla->expander($setop => $self->cb('_expand_setop'));
+ $sqla->renderer($setop => $self->cb('_render_setop'));
+ }
+
+ my $setop_expander = $self->cb('_expand_clause_setop');
$sqla->clause_expanders(
map +($_ => $setop_expander),
qw(union intersect except)
);
- $sqla->clause_expander('select.with' => my $with_expander = $self->cb(sub {
- my ($self, $name, $with) = @_;
- my (undef, $type) = split '_', $name;
- if (ref($with) eq 'HASH') {
- return +{
- %$with,
- queries => [
- map +[
- $self->expand_expr({ -alias => $_->[0] }, -ident),
- $self->expand_expr($_->[1]),
- ], @{$with->{queries}}
- ]
- }
- }
- my @with = @$with;
- my @exp;
- while (my ($alias, $query) = splice @with, 0, 2) {
- push @exp, [
- $self->expand_expr({ -alias => $alias }, -ident),
- $self->expand_expr($query)
- ];
- }
- return +(with => { ($type ? (type => $type) : ()), queries => \@exp });
- }));
- $sqla->clause_expander('select.with_recursive', $with_expander);
- $sqla->clause_renderer('select.with' => my $with_renderer = $self->cb(sub {
- my ($self, undef, $with) = @_;
- my $q_part = $self->join_query_parts(', ',
- map {
- my ($alias, $query) = @$_;
- $self->join_query_parts(' ',
- $alias,
- $self->format_keyword('as'),
- $query,
- )
- } @{$with->{queries}}
- );
- return $self->join_query_parts(' ',
- $self->format_keyword(join '_', 'with', ($with->{type}||'')),
- $q_part,
- );
- }));
+ my $w_exp = $self->cb('_expand_with');
+ my $w_rdr = $self->cb('_render_with');
+ $sqla->clause_expander('select.with' => $w_exp);
+ $sqla->clause_expander('select.with_recursive' => $w_exp);
+ $sqla->clause_renderer('select.with' => $w_rdr);
+
foreach my $stmt (qw(insert update delete)) {
$sqla->clauses_of($stmt => 'with', $sqla->clauses_of($stmt));
- $sqla->clause_expander("${stmt}.$_", $with_expander)
+ $sqla->clause_expander("${stmt}.$_" => $w_exp)
for qw(with with_recursive);
- $sqla->clause_renderer("${stmt}.with", $with_renderer);
+ $sqla->clause_renderer("${stmt}.with" => $w_rdr);
}
- $sqla->expander(cast => $self->cb(sub {
- return { -func => [ cast => $_[2] ] } if ref($_[2]) eq 'HASH';
- my ($cast, $to) = @{$_[2]};
- +{ -func => [ cast => { -as => [
- $self->expand_expr($cast),
- $self->expand_expr($to, -ident),
- ] } ] };
- }));
+
+ $sqla->expander(cast => $self->cb('_expand_cast'));
$sqla->clause_expanders(
- "select.from", $self->cb('_expand_select_clause_from'),
+ "select.from", $self->cb('_expand_from_list'),
"update.target", $self->cb('_expand_update_clause_target'),
"update.update", $self->cb('_expand_update_clause_target'),
);
return $sqla;
}
-sub _expand_select_clause_from {
- my ($self, undef, $from) = @_;
- +(from => $self->_expand_from_list(undef, $from));
+sub _expand_select {
+ my ($self, $orig, $before_setop, @args) = @_;
+ my $exp = $self->sqla->$orig(@args);
+ return $exp unless my $setop = (my $sel = $exp->{-select})->{setop};
+ if (my @keys = grep $sel->{$_}, @$before_setop) {
+ my %inner; @inner{@keys} = delete @{$sel}{@keys};
+ unshift @{(values(%$setop))[0]{queries}},
+ { -select => \%inner };
+ }
+ return $exp;
}
sub _expand_from_list {
my @parts = (
$args->{from},
- $self->format_keyword(join '_', ($args->{type}||()), 'join'),
+ { -keyword => join '_', ($args->{type}||()), 'join' },
(map +($_->{-ident} || $_->{-as} ? $_ : ('(', $_, ')')), $args->{to}),
($args->{on} ? (
- $self->format_keyword('on') ,
+ { -keyword => 'on' },
$args->{on},
) : ()),
($args->{using} ? (
- $self->format_keyword('using'),
+ { -keyword => 'using' },
'(', $args->{using}, ')',
) : ()),
);
return $self->join_query_parts(
' ',
$thing,
- $self->format_keyword('as'),
+ { -keyword => 'as' },
$alias,
);
}
+(target => $self->_expand_from_list(undef, $target));
}
+sub _expand_cast {
+ my ($self, undef, $thing) = @_;
+ return { -func => [ cast => $thing ] } if ref($thing) eq 'HASH';
+ my ($cast, $to) = @{$thing};
+ +{ -func => [ cast => { -as => [
+ $self->expand_expr($cast),
+ $self->expand_expr($to, -ident),
+ ] } ] };
+}
+
+sub _expand_alias {
+ my ($self, undef, $args) = @_;
+ if (ref($args) eq 'HASH' and my $alias = $args->{-alias}) {
+ $args = $alias;
+ }
+ +{ -alias => [
+ map $self->expand_expr($_, -ident),
+ ref($args) eq 'ARRAY' ? @{$args} : $args
+ ]
+ }
+}
+
+sub _expand_with {
+ my ($self, $name, $with) = @_;
+ my (undef, $type) = split '_', $name;
+ if (ref($with) eq 'HASH') {
+ return +{
+ %$with,
+ queries => [
+ map +[
+ $self->expand_expr({ -alias => $_->[0] }, -ident),
+ $self->expand_expr($_->[1]),
+ ], @{$with->{queries}}
+ ]
+ }
+ }
+ my @with = @$with;
+ my @exp;
+ while (my ($alias, $query) = splice @with, 0, 2) {
+ push @exp, [
+ $self->expand_expr({ -alias => $alias }, -ident),
+ $self->expand_expr($query)
+ ];
+ }
+ return +(with => { ($type ? (type => $type) : ()), queries => \@exp });
+}
+
+sub _render_with {
+ my ($self, undef, $with) = @_;
+ my $q_part = $self->join_query_parts(', ',
+ map {
+ my ($alias, $query) = @$_;
+ $self->join_query_parts(' ',
+ $alias,
+ { -keyword => 'as' },
+ $query,
+ )
+ } @{$with->{queries}}
+ );
+ return $self->join_query_parts(' ',
+ { -keyword => join '_', 'with', ($with->{type}||'') },
+ $q_part,
+ );
+}
+
+sub _expand_setop {
+ my ($self, $setop, $args) = @_;
+ +{ "-${setop}" => {
+ %$args,
+ queries => [ map $self->expand_expr($_), @{$args->{queries}} ],
+ } };
+}
+
+sub _render_setop {
+ my ($self, $setop, $args) = @_;
+ $self->join_query_parts(
+ { -keyword => ' '.join('_', $setop, ($args->{type}||())).' ' },
+ @{$args->{queries}}
+ );
+}
+
+sub _expand_clause_setop {
+ my ($self, $setop, $args) = @_;
+ my ($op, $type) = split '_', $setop;
+ +(setop => $self->expand_expr({
+ "-${op}" => {
+ ($type ? (type => $type) : ()),
+ queries => (ref($args) eq 'ARRAY' ? $args : [ $args ])
+ }
+ }));
+}
+
1;