) ],
);
-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->clause_expanders(
'update.from' => $self->cb('_expand_select_clause_from'),
- 'delete.using' => $self->cb(sub {
- +(using => $_[0]->_expand_from_list(undef, $_[2]));
- }),
+ '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->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),
return $sqla;
}
+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_select_clause_from {
my ($self, undef, $from) = @_;
+(from => $self->_expand_from_list(undef, $from));
);
}
+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(
+ ' '.$self->format_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;