X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FSQL%2FAbstract%2FExtraClauses.pm;h=c055b8b28a12250ce18546c31ddb26edb53b92b1;hb=a01911a20b326afd1a45f97f14aca68206708eba;hp=00e4d2aea8da406ddb8614b7871309928bc6d792;hpb=ee706e89c8703b720f970a16163d36de9a30e7d4;p=scpubgit%2FQ-Branch.git

diff --git a/lib/SQL/Abstract/ExtraClauses.pm b/lib/SQL/Abstract/ExtraClauses.pm
index 00e4d2a..c055b8b 100644
--- a/lib/SQL/Abstract/ExtraClauses.pm
+++ b/lib/SQL/Abstract/ExtraClauses.pm
@@ -11,9 +11,17 @@ BEGIN { *puke = \&SQL::Abstract::puke }
 sub register_defaults {
   my $self = shift;
   $self->next::method(@_);
-  $self->clauses_of(
-    select => $self->clauses_of('select'), qw(group_by having)
-  );
+  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 => 'with', @clauses);
   $self->clause_expanders(
     'select.group_by', sub {
       $_[0]->_expand_maybe_list_expr($_[1], -ident)
@@ -52,9 +60,112 @@ sub register_defaults {
       +(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}} ],
+    } };
+  };
+  $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, 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,
+    );
+  });
+
   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));
@@ -108,36 +219,29 @@ sub _expand_join {
 }
 
 sub _render_from_list {
-  my ($self, $list) = @_;
-  return $self->_join_parts(', ', map [ $self->render_aqt($_) ], @$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}) ],
-    [ $self->_sqlcase(
-        ($args->{type}
-          ? join(' ', split '_', $args->{type}).' '
-          : ''
-        )
-        .'join'
-      )
-    ],
+    [ $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 {
@@ -148,25 +252,36 @@ sub _expand_op_as {
 }
 
 sub _render_as {
-  my ($self, $args) = @_;
-  my ($thing, $as, @cols) = @$args;
-  return $self->_join_parts(
+  my ($self, undef, $args) = @_;
+  my ($thing, @alias) = @$args;
+  return $self->join_clauses(
     ' ',
     [ $self->render_aqt($thing) ],
-    [ $self->_sqlcase('as') ],
-    (@cols
-      ? [ $self->_join_parts('',
-            [ $self->render_aqt($as) ],
-            [ '(' ],
-            [ $self->_join_parts(
-                ', ',
-                map [ $self->render_aqt($_) ], @cols
-            ) ],
-            [ ')' ],
-        ) ]
-      : [ $self->render_aqt($as) ]
-    ),
+    [ $self->format_keyword('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;