X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FSQL%2FAbstract%2FExtraClauses.pm;h=98789417de17ae61588a8151c1c7d3cb02412814;hb=38c5397d5e9cb9be87c07cae532afef6437cf4eb;hp=7c534c13741a1645096d1b52e2e9c2fa0da51cd5;hpb=260e0f29059f53f8486828f67a1eafc60863d38a;p=scpubgit%2FQ-Branch.git

diff --git a/lib/SQL/Abstract/ExtraClauses.pm b/lib/SQL/Abstract/ExtraClauses.pm
index 7c534c1..9878941 100644
--- 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,20 +51,20 @@ 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] }));
     },
   );
 
   # 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};
@@ -74,8 +74,8 @@ sub register_defaults {
           { -select => \%inner };
       }
       return $exp;
-    });
-  }
+    }
+  });
   my $expand_setop = sub {
     my ($self, $setop, $args) = @_;
     +{ "-${setop}" => {
@@ -86,38 +86,39 @@ 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->join_query_parts(
       ' '.$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)) {
+  my $setop_expander = 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 ])
+      }
+    }));
+  };
+
+  $self->clause_expanders(
+    map +($_ => $setop_expander),
+      map "select.${_}",
+        map +($_, "${_}_all", "${_}_distinct"),
+          qw(union intersect except)
+  );
 
-    $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] ]),
-                   }
-                 }));
-    });
-  }
   $self->clause_expander('select.with' => my $with_expander = sub {
-    my ($self, $with) = @_;
+    my ($self, $name, $with) = @_;
+    my (undef, $type) = split '_', $name;
     if (ref($with) eq 'HASH') {
       return +{
         %$with,
@@ -134,29 +135,22 @@ sub register_defaults {
         $self->expand_expr($query)
       ];
     }
-    return +{ queries => \@exp };
-  });
-  $self->clause_expander('select.with_recursive' => sub {
-    my ($self, $with) = @_;
-    my $exp = $self->$with_expander($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, $with) = @_;
-    my $q_part = [ $self->join_clauses(', ',
+    my ($self, undef, $with) = @_;
+    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) ],
         ) ]
       } @{$with->{queries}}
     ) ];
-    return $self->join_clauses(' ',
+    return $self->join_query_parts(' ',
       [ $self->format_keyword(join '_', 'with', ($with->{type}||'')) ],
       $q_part,
     );
@@ -168,7 +162,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));
 }
 
@@ -221,7 +215,7 @@ sub _expand_join {
 
 sub _render_from_list {
   my ($self, undef, $list) = @_;
-  return $self->join_clauses(', ', map [ $self->render_aqt($_) ], @$list);
+  return $self->join_query_parts(', ', map [ $self->render_aqt($_) ], @$list);
 }
 
 sub _render_join {
@@ -242,7 +236,7 @@ sub _render_join {
       [ $self->render_aqt($args->{using}) ],
     ) : ()),
   );
-  return $self->join_clauses(' ', @parts);
+  return $self->join_query_parts(' ', @parts);
 }
 
 sub _expand_op_as {
@@ -255,7 +249,7 @@ 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') ],
@@ -267,10 +261,10 @@ sub _render_alias {
   my ($self, $args) = @_;
   my ($as, @cols) = @$args;
   return (@cols
-    ? $self->join_clauses('',
+    ? $self->join_query_parts('',
          [ $self->render_aqt($as) ],
          [ '(' ],
-         [ $self->join_clauses(
+         [ $self->join_query_parts(
              ', ',
              map [ $self->render_aqt($_) ], @cols
          ) ],
@@ -281,7 +275,7 @@ sub _render_alias {
 }
 
 sub _expand_update_clause_target {
-  my ($self, $target) = @_;
+  my ($self, undef, $target) = @_;
   +(target => $self->_expand_from_list(undef, $target));
 }