X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FSQL%2FAbstract%2FExtraClauses.pm;h=386d1e37058cd7b9de958850db721bbf9d9f473d;hb=51ccda04f35c44d4556c003d162ebcec72352230;hp=e29aea396a17ebd02fcf747f70895d5a8b081791;hpb=1ba47f38ffd3b99b3ae3be9520edafd560bfb026;p=scpubgit%2FQ-Branch.git

diff --git a/lib/SQL/Abstract/ExtraClauses.pm b/lib/SQL/Abstract/ExtraClauses.pm
index e29aea3..386d1e3 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}")
@@ -35,6 +35,18 @@ sub register_defaults {
   $self->op_expander(as => '_expand_op_as');
   $self->expander(as => '_expand_op_as');
   $self->renderer(as => '_render_as');
+  $self->expander(alias => sub {
+    my ($self, undef, $args) = @_;
+    if (ref($args) eq 'HASH' and my $alias = $args->{-alias}) {
+      $args = $alias;
+    }
+    +{ -alias => [
+        map $self->expand_expr($_, -ident),
+        ref($args) eq 'ARRAY' ? @{$args} : $args
+      ]
+    }
+  });
+  $self->renderer(alias => '_render_alias');
 
   $self->clauses_of(update => sub {
     my ($self, @clauses) = @_;
@@ -51,20 +63,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 +86,8 @@ sub register_defaults {
           { -select => \%inner };
       }
       return $exp;
-    });
-  }
+    }
+  });
   my $expand_setop = sub {
     my ($self, $setop, $args) = @_;
     +{ "-${setop}" => {
@@ -86,95 +98,91 @@ 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);
   });
 
-  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->renderer($_ => sub {
+    my ($self, $setop, $args) = @_;
+    $self->join_query_parts(
+      ' '.$self->format_keyword(join '_', $setop, ($args->{type}||())).' ',
+      @{$args->{queries}}
+    );
+  }) for 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,
-        queries => [ map $self->expand_expr($_), @{$with->{queries}} ]
+        queries => [
+          map +[
+            $self->expand_expr({ -alias => $_->[0] }, -ident),
+            $self->expand_expr($_->[1]),
+          ], @{$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;
+    while (my ($alias, $query) = splice @with, 0, 2) {
       push @exp, [
-        \@n,
+        $self->expand_expr({ -alias => $alias }, -ident),
         $self->expand_expr($query)
       ];
     }
-    return +{ queries => \@exp };
-  });
-  $self->clause_expander('select.with_recursive' => sub {
-    my ($self, $with) = @_;
-    my $exp = $self->$with_expander($with);
-    return +{
-      %$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->_render_alias($alias) ],
-            [ $self->format_keyword('as') ],
-            [ $self->render_aqt($query) ],
-        ) ]
+        $self->join_query_parts(' ',
+            $alias,
+            $self->format_keyword('as'),
+            $query,
+        )
       } @{$with->{queries}}
-    ) ];
-    return $self->join_clauses('',
-      [ $self->format_keyword(join '_', 'with', ($with->{type}||'')).' (' ],
+    );
+    return $self->join_query_parts(' ',
+      $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) = @_;
+  my ($self, undef, $from) = @_;
   +(from => $self->_expand_from_list(undef, $from));
 }
 
 sub _expand_from_list {
   my ($self, undef, $args) = @_;
   if (ref($args) eq 'HASH') {
+    return $args if $args->{-from_list};
     return { -from_list => [ $self->expand_expr($args) ] };
   }
   my @list;
@@ -206,7 +214,7 @@ sub _expand_join {
       : (to => $args->[0], @{$args}[1..$#$args])
   );
   if (my $as = delete $proto{as}) {
-    $proto{to} = { -as => [ $proto{to}, ref($as) eq 'ARRAY' ? @$as : $as ] };
+    $proto{to} = $self->expand_expr({ -as => [ $proto{to}, $as ] });
   }
   if (defined($proto{using}) and ref(my $using = $proto{using}) ne 'HASH') {
     $proto{using} = { -row => [
@@ -220,64 +228,72 @@ sub _expand_join {
 }
 
 sub _render_from_list {
-  my ($self, $list) = @_;
-  return $self->join_clauses(', ', map [ $self->render_aqt($_) ], @$list);
+  my ($self, undef, $list) = @_;
+  return $self->join_query_parts(', ', @$list);
 }
 
 sub _render_join {
-  my ($self, $args) = @_;
+  my ($self, undef, $args) = @_;
 
   my @parts = (
-    [ $self->render_aqt($args->{from}) ],
-    [ $self->format_keyword(join '_', ($args->{type}||()), 'join') ],
-    [ $self->render_aqt(
-        map +($_->{-ident} || $_->{-as} ? $_ : { -row => [ $_ ] }), $args->{to}
-    ) ],
+    $args->{from},
+    $self->format_keyword(join '_', ($args->{type}||()), 'join'),
+    (map +($_->{-ident} || $_->{-as} ? $_ : ('(', $_, ')')), $args->{to}),
     ($args->{on} ? (
-      [ $self->format_keyword('on') ],
-      [ $self->render_aqt($args->{on}) ],
+      $self->format_keyword('on') ,
+      $args->{on},
     ) : ()),
     ($args->{using} ? (
-      [ $self->format_keyword('using') ],
-      [ $self->render_aqt($args->{using}) ],
+      $self->format_keyword('using'),
+      $args->{using},
     ) : ()),
   );
-  return $self->join_clauses(' ', @parts);
+  return $self->join_query_parts(' ', @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 };
+  my @vv = (ref($vv) eq 'ARRAY' ? @$vv : $vv);
+  $k ||= shift @vv;
+  my $ik = $self->expand_expr($k, -ident);
+  return +{ -as => [ $ik, $self->expand_expr($vv[0], -alias) ] }
+    if @vv == 1 and ref($vv[0]) eq 'HASH';
+
+  my @as = map $self->expand_expr($_, -ident), @vv;
+  return { -as => [ $ik, { -alias => \@as } ] };
 }
 
 sub _render_as {
-  my ($self, $args) = @_;
-  my ($thing, @alias) = @$args;
-  return $self->join_clauses(
+  my ($self, undef, $args) = @_;
+  my ($thing, $alias) = @$args;
+  return $self->join_query_parts(
     ' ',
-    [ $self->render_aqt($thing) ],
-    [ $self->format_keyword('as') ],
-    [ $self->_render_alias(\@alias) ],
+    $thing,
+    $self->format_keyword('as'),
+    $alias,
   );
 }
 
 sub _render_alias {
-  my ($self, $args) = @_;
+  my ($self, undef, $args) = @_;
   my ($as, @cols) = @$args;
   return (@cols
-    ? $self->join_clauses('',
-         [ $self->render_aqt($as) ],
-         [ '(' ],
-         [ $self->join_clauses(
-             ', ',
-             map [ $self->render_aqt($_) ], @cols
-         ) ],
-         [ ')' ],
+    ? $self->join_query_parts('',
+         $as,
+         '(',
+         $self->join_query_parts(
+           ', ',
+           @cols
+         ),
+         ')',
       )
     : $self->render_aqt($as)
   );
 }
 
+sub _expand_update_clause_target {
+  my ($self, undef, $target) = @_;
+  +(target => $self->_expand_from_list(undef, $target));
+}
+
 1;