clean up 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 ae1ded5..c055b8b 100644 (file)
--- a/lib/SQL/Abstract/ExtraClauses.pm
+++ b/lib/SQL/Abstract/ExtraClauses.pm
@@ -21,7 +21,7 @@ sub register_defaults {
     }
   }
   die "Huh?" unless @before_setop;
-  $self->clauses_of(select => @clauses);
+  $self->clauses_of(select => 'with', @clauses);
   $self->clause_expanders(
     'select.group_by', sub {
       $_[0]->_expand_maybe_list_expr($_[1], -ident)
@@ -76,40 +76,88 @@ sub register_defaults {
       return $exp;
     });
   }
-
-  $self->clause_expander('select.union' => sub {
-    +(setop => $_[0]->expand_expr({
-                 -union => {
-                   queries => (ref($_[1]) eq 'ARRAY' ? $_[1] : [ $_[1] ]),
-                 }
-               }));
-  });
-  $self->clause_expander('select.union_all' => sub {
-    +(setop => $_[0]->expand_expr({
-                 -union => {
-                   type => 'all',
-                   queries => (ref($_[1]) eq 'ARRAY' ? $_[1] : [ $_[1] ]),
-                 }
-               }));
-  });
-  $self->expander(union => sub {
-    my ($self, undef, $args) = @_;
-    +{ -union => {
+  my $expand_setop = sub {
+    my ($self, $setop, $args) = @_;
+    +{ "-${setop}" => {
          %$args,
          queries => [ map $self->expand_expr($_), @{$args->{queries}} ],
     } };
-  });
+  };
+  $self->expanders(map +($_ => $expand_setop), qw(union intersect except));
 
   $self->clause_renderer('select.setop' => sub {
     my ($self, $setop) = @_;
     $self->render_aqt($setop);
   });
 
-  $self->renderer(union => sub {
-    my ($self, $args) = @_;
-    $self->join_clauses(
-      ' '.$self->format_keyword(join '_', 'union', ($args->{type}||())).' ',
-      map [ $self->render_aqt($_) ], @{$args->{queries}}
+  foreach my $setop (qw(union intersect except)) {
+    $self->renderer($setop => sub {
+      my ($self, undef, $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] ]),
+                   }
+                 }));
+    });
+  }
+  $self->clause_expander('select.with' => my $with_expander = sub {
+    my ($self, $with) = @_;
+    if (ref($with) eq 'HASH') {
+      return +{
+        %$with,
+        queries => [ map $self->expand_expr($_), @{$with->{queries}} ]
+      }
+    }
+    my @with = @$with;
+    my @exp;
+    while (my ($name, $query) = splice @with, 0, 2) {
+      my @n = map $self->expand_expr($_, -ident),
+                ref($name) eq 'ARRAY' ? @$name : $name;
+      push @exp, [
+        \@n,
+        $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'
+    });
+  });
+  $self->clause_renderer('select.with' => sub {
+    my ($self, $with) = @_;
+    my $q_part = [ $self->join_clauses(', ',
+      map {
+        my ($alias, $query) = @$_;
+        [ $self->join_clauses(' ',
+            [ $self->_render_alias($alias) ],
+            [ $self->format_keyword('as') ],
+            [ $self->render_aqt($query) ],
+        ) ]
+      } @{$with->{queries}}
+    ) ];
+    return $self->join_clauses(' ',
+      [ $self->format_keyword(join '_', 'with', ($with->{type}||'')) ],
+      $q_part,
     );
   });
 
@@ -171,12 +219,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}) ],
@@ -204,25 +252,36 @@ sub _expand_op_as {
 }
 
 sub _render_as {
-  my ($self, $args) = @_;
-  my ($thing, $as, @cols) = @$args;
+  my ($self, undef, $args) = @_;
+  my ($thing, @alias) = @$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) ]
-    ),
+    [ $self->_render_alias(\@alias) ],
   );
 }
 
+sub _render_alias {
+  my ($self, $args) = @_;
+  my ($as, @cols) = @$args;
+  return (@cols
+    ? $self->join_clauses('',
+         [ $self->render_aqt($as) ],
+         [ '(' ],
+         [ $self->join_clauses(
+             ', ',
+             map [ $self->render_aqt($_) ], @cols
+         ) ],
+         [ ')' ],
+      )
+    : $self->render_aqt($as)
+  );
+}
+
+sub _expand_update_clause_target {
+  my ($self, $target) = @_;
+  +(target => $self->_expand_from_list(undef, $target));
+}
+
 1;