move clause rendering to better calling convention

[scpubgit/Q-Branch.git] / lib / SQL / Abstract / ExtraClauses.pm

diff --git a/lib/SQL/Abstract/ExtraClauses.pm b/lib/SQL/Abstract/ExtraClauses.pm
index f471794..ad49758 100644 (file)
--- a/lib/SQL/Abstract/ExtraClauses.pm
+++ b/lib/SQL/Abstract/ExtraClauses.pm
@@ -24,9 +24,9 @@ sub register_defaults {
   $self->clauses_of(select => 'with', @clauses);
   $self->clause_expanders(
     'select.group_by', sub {
-      $_[0]->_expand_maybe_list_expr($_[1], -ident)
+      $_[0]->_expand_maybe_list_expr($_[2], -ident)
     },
-    'select.having', 'expand_expr',
+    'select.having', sub { $_[0]->expand_expr($_[2]) },
   );
   foreach my $thing (qw(join from_list)) {
     $self->expander($thing => "_expand_${thing}")
@@ -51,13 +51,13 @@ sub register_defaults {
   $self->clause_expanders(
     'update.from' => '_expand_select_clause_from',
     'delete.using' => sub {
-      +(using => $_[0]->_expand_from_list(undef, $_[1]));
+      +(using => $_[0]->_expand_from_list(undef, $_[2]));
     },
     'insert.rowvalues' => sub {
-      +(from => $_[0]->expand_expr({ -values => $_[1] }));
+      +(from => $_[0]->expand_expr({ -values => $_[2] }));
     },
     'insert.select' => sub {
-      +(from => $_[0]->expand_expr({ -select => $_[1] }));
+      +(from => $_[0]->expand_expr({ -select => $_[2] }));
     },
   );
 
@@ -86,23 +86,24 @@ sub register_defaults {
   $self->expanders(map +($_ => $expand_setop), qw(union intersect except));
 
   $self->clause_renderer('select.setop' => sub {
-    my ($self, $setop) = @_;
+    my ($self, undef, $setop) = @_;
     $self->render_aqt($setop);
   });
 
+  $self->renderer($_ => sub {
+    my ($self, $setop, $args) = @_;
+    $self->join_clauses(
+      ' '.$self->format_keyword(join '_', $setop, ($args->{type}||())).' ',
+      map [ $self->render_aqt($_) ], @{$args->{queries}}
+    );
+  }) for qw(union intersect except);
+
   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] ]),
+                     queries => (ref($_[2]) eq 'ARRAY' ? $_[2] : [ $_[2] ]),
                    }
                  }));
     });
@@ -110,13 +111,13 @@ sub register_defaults {
       +(setop => $_[0]->expand_expr({
                    "-${setop}" => {
                      type => 'all',
-                     queries => (ref($_[1]) eq 'ARRAY' ? $_[1] : [ $_[1] ]),
+                     queries => (ref($_[2]) eq 'ARRAY' ? $_[2] : [ $_[2] ]),
                    }
                  }));
     });
   }
   $self->clause_expander('select.with' => my $with_expander = sub {
-    my ($self, $with) = @_;
+    my ($self, undef, $with) = @_;
     if (ref($with) eq 'HASH') {
       return +{
         %$with,
@@ -136,15 +137,15 @@ sub register_defaults {
     return +{ queries => \@exp };
   });
   $self->clause_expander('select.with_recursive' => sub {
-    my ($self, $with) = @_;
-    my $exp = $self->$with_expander($with);
+    my ($self, undef, $with) = @_;
+    my $exp = $self->$with_expander(undef, $with);
     return +(with => +{
       %$exp,
       type => 'recursive'
     });
   });
   $self->clause_renderer('select.with' => sub {
-    my ($self, $with) = @_;
+    my ($self, undef, $with) = @_;
     my $q_part = [ $self->join_clauses(', ',
       map {
         my ($alias, $query) = @$_;
@@ -167,7 +168,7 @@ sub register_defaults {
 sub format_keyword { $_[0]->_sqlcase(join ' ', split '_', $_[1]) }
 
 sub _expand_select_clause_from {
-  my ($self, $from) = @_;
+  my ($self, undef, $from) = @_;
   +(from => $self->_expand_from_list(undef, $from));
 }
 
@@ -219,12 +220,12 @@ sub _expand_join {
 }
 
 sub _render_from_list {
-  my ($self, $list) = @_;
+  my ($self, undef, $list) = @_;
   return $self->join_clauses(', ', map [ $self->render_aqt($_) ], @$list);
 }
 
 sub _render_join {
-  my ($self, $args) = @_;
+  my ($self, undef, $args) = @_;
 
   my @parts = (
     [ $self->render_aqt($args->{from}) ],
@@ -252,7 +253,7 @@ sub _expand_op_as {
 }
 
 sub _render_as {
-  my ($self, $args) = @_;
+  my ($self, undef, $args) = @_;
   my ($thing, @alias) = @$args;
   return $self->join_clauses(
     ' ',
@@ -280,7 +281,7 @@ sub _render_alias {
 }
 
 sub _expand_update_clause_target {
-  my ($self, $target) = @_;
+  my ($self, undef, $target) = @_;
   +(target => $self->_expand_from_list(undef, $target));
 }