BEGIN { *puke = \&SQL::Abstract::puke }
-sub new {
- my ($proto, @args) = @_;
- my $new = $proto->next::method(@args);
- $new->{clauses_of}{select} = [
- @{$new->{clauses_of}{select}}, qw(group_by having)
- ];
- $new->{expand_clause}{'select.group_by'} = sub {
- $_[0]->_expand_maybe_list_expr($_[1], -ident)
- };
- $new->{expand_clause}{'select.having'} = sub {
- $_[0]->expand_expr($_[1])
+sub register_defaults {
+ my $self = shift;
+ $self->next::method(@_);
+ my @clauses = $self->clauses_of('select');
+ my @before_setop;
+ CLAUSE: foreach my $idx (0..$#clauses) {
+ if ($clauses[$idx] eq 'order_by') {
+ @before_setop = @clauses[0..$idx-1];
+ splice(@clauses, $idx, 0, qw(setop group_by having));
+ last CLAUSE;
+ }
+ }
+ die "Huh?" unless @before_setop;
+ $self->clauses_of(select => @clauses);
+ $self->clause_expanders(
+ 'select.group_by', sub {
+ $_[0]->_expand_maybe_list_expr($_[1], -ident)
+ },
+ 'select.having', 'expand_expr',
+ );
+ foreach my $thing (qw(join from_list)) {
+ $self->expander($thing => "_expand_${thing}")
+ ->renderer($thing => "_render_${thing}")
+ }
+ $self->op_expander(as => '_expand_op_as');
+ $self->expander(as => '_expand_op_as');
+ $self->renderer(as => '_render_as');
+
+ $self->clauses_of(update => sub {
+ my ($self, @clauses) = @_;
+ splice(@clauses, 2, 0, 'from');
+ @clauses;
+ });
+
+ $self->clauses_of(delete => sub {
+ my ($self, @clauses) = @_;
+ splice(@clauses, 1, 0, 'using');
+ @clauses;
+ });
+
+ $self->clause_expanders(
+ 'update.from' => '_expand_select_clause_from',
+ 'delete.using' => sub {
+ +(using => $_[0]->_expand_from_list(undef, $_[1]));
+ },
+ 'insert.rowvalues' => sub {
+ +(from => $_[0]->expand_expr({ -values => $_[1] }));
+ },
+ 'insert.select' => sub {
+ +(from => $_[0]->expand_expr({ -select => $_[1] }));
+ },
+ );
+
+ # set ops
+ {
+ my $orig = $self->expander('select');
+ $self->expander(select => sub {
+ my $self = shift;
+ my $exp = $self->$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;
+ });
+ }
+ my $expand_setop = sub {
+ my ($self, $setop, $args) = @_;
+ +{ "-${setop}" => {
+ %$args,
+ queries => [ map $self->expand_expr($_), @{$args->{queries}} ],
+ } };
};
- $new->{expand}{from_list} = '_expand_from_list';
- $new->{render}{from_list} = '_render_from_list';
- $new->{expand}{join} = '_expand_join';
- $new->{render}{join} = '_render_join';
- return $new;
+ $self->expanders(map +($_ => $expand_setop), qw(union intersect except));
+
+ $self->clause_renderer('select.setop' => sub {
+ my ($self, $setop) = @_;
+ $self->render_aqt($setop);
+ });
+
+ foreach my $setop (qw(union intersect except)) {
+ $self->renderer($setop => sub {
+ my ($self, $args) = @_;
+ $self->join_clauses(
+ ' '.$self->format_keyword(join '_', $setop, ($args->{type}||())).' ',
+ map [ $self->render_aqt($_) ], @{$args->{queries}}
+ );
+ });
+
+ $self->clause_expander("select.${setop}" => sub {
+ +(setop => $_[0]->expand_expr({
+ "-${setop}" => {
+ queries => (ref($_[1]) eq 'ARRAY' ? $_[1] : [ $_[1] ]),
+ }
+ }));
+ });
+ $self->clause_expander("select.${setop}_all" => sub {
+ +(setop => $_[0]->expand_expr({
+ "-${setop}" => {
+ type => 'all',
+ queries => (ref($_[1]) eq 'ARRAY' ? $_[1] : [ $_[1] ]),
+ }
+ }));
+ });
+ }
+
+ return $self;
}
+sub format_keyword { $_[0]->_sqlcase(join ' ', split '_', $_[1]) }
+
sub _expand_select_clause_from {
my ($self, $from) = @_;
+(from => $self->_expand_from_list(undef, $from));
return { -from_list => [ $self->expand_expr($args) ] };
}
my @list;
- my @args = ref($args) ? @$args : ($args);
+ my @args = ref($args) eq 'ARRAY' ? @$args : ($args);
while (my $entry = shift @args) {
- if (!ref($entry) and $entry =~ /^-/) {
+ if (!ref($entry) and $entry =~ /^-(.*)/) {
+ if ($1 eq 'as') {
+ $list[-1] = $self->expand_expr({ -as => [
+ $list[-1], map +(ref($_) eq 'ARRAY' ? @$_ : $_), shift(@args)
+ ]});
+ next;
+ }
$entry = { $entry => shift @args };
}
my $aqt = $self->expand_expr($entry, -ident);
? %$args
: (to => $args->[0], @{$args}[1..$#$args])
);
+ if (my $as = delete $proto{as}) {
+ $proto{to} = { -as => [ $proto{to}, ref($as) eq 'ARRAY' ? @$as : $as ] };
+ }
+ if (defined($proto{using}) and ref(my $using = $proto{using}) ne 'HASH') {
+ $proto{using} = { -row => [
+ map [ $self->expand_expr($_, -ident) ],
+ ref($using) eq 'ARRAY' ? @$using: $using
+ ] };
+ }
my %ret = map +($_ => $self->expand_expr($proto{$_}, -ident)),
sort keys %proto;
return +{ -join => \%ret };
sub _render_from_list {
my ($self, $list) = @_;
- return $self->_join_parts(', ', map [ $self->render_aqt($_) ], @$list);
+ return $self->join_clauses(', ', map [ $self->render_aqt($_) ], @$list);
}
sub _render_join {
my @parts = (
[ $self->render_aqt($args->{from}) ],
- [ $self->_sqlcase(
- ($args->{type}
- ? join(' ', split '_', $args->{type}).' '
- : ''
- )
- .'join'
- )
- ],
- [ $self->render_aqt($args->{to}) ],
+ [ $self->format_keyword(join '_', ($args->{type}||()), 'join') ],
+ [ $self->render_aqt(
+ map +($_->{-ident} || $_->{-as} ? $_ : { -row => [ $_ ] }), $args->{to}
+ ) ],
($args->{on} ? (
- [ $self->_sqlcase('on') ],
+ [ $self->format_keyword('on') ],
[ $self->render_aqt($args->{on}) ],
) : ()),
($args->{using} ? (
- [ $self->_sqlcase('using') ],
+ [ $self->format_keyword('using') ],
[ $self->render_aqt($args->{using}) ],
) : ()),
);
- return $self->_join_parts(' ', @parts);
+ return $self->join_clauses(' ', @parts);
+}
+
+sub _expand_op_as {
+ my ($self, undef, $vv, $k) = @_;
+ my @as = map $self->expand_expr($_, -ident),
+ (defined($k) ? ($k) : ()), ref($vv) eq 'ARRAY' ? @$vv : $vv;
+ return { -as => \@as };
+}
+
+sub _render_as {
+ my ($self, $args) = @_;
+ my ($thing, $as, @cols) = @$args;
+ return $self->join_clauses(
+ ' ',
+ [ $self->render_aqt($thing) ],
+ [ $self->format_keyword('as') ],
+ (@cols
+ ? [ $self->join_clauses('',
+ [ $self->render_aqt($as) ],
+ [ '(' ],
+ [ $self->join_clauses(
+ ', ',
+ map [ $self->render_aqt($_) ], @cols
+ ) ],
+ [ ')' ],
+ ) ]
+ : [ $self->render_aqt($as) ]
+ ),
+ );
}
1;