X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FSQL%2FAbstract%2FExtraClauses.pm;h=2dafda1aa83f606a7a7eab566fca1b345c9e6a0b;hb=a97ecd95f2256f8e86c370fb19c570aa013cbf89;hp=9af44a585b1f640cd9ca7a52d8f34ef24dcbf73e;hpb=38e67490d05429a527277addc383daac165e4db7;p=scpubgit%2FQ-Branch.git

diff --git a/lib/SQL/Abstract/ExtraClauses.pm b/lib/SQL/Abstract/ExtraClauses.pm
index 9af44a5..2dafda1 100644
--- a/lib/SQL/Abstract/ExtraClauses.pm
+++ b/lib/SQL/Abstract/ExtraClauses.pm
@@ -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) = @_;
@@ -116,14 +128,6 @@ sub register_defaults {
           qw(union intersect except)
   );
 
-  my $expand_alias = sub {
-    my ($self, $to_expand) = @_;
-    [ map $self->expand_expr($_, -ident),
-        ref($to_expand) eq 'ARRAY'
-          ? @$to_expand
-          : $to_expand
-    ]
-  };
   $self->clause_expander('select.with' => my $with_expander = sub {
     my ($self, $name, $with) = @_;
     my (undef, $type) = split '_', $name;
@@ -132,7 +136,7 @@ sub register_defaults {
         %$with,
         queries => [
           map +[
-            $self->$expand_alias($_->[0]),
+            $self->expand_expr({ -alias => $_->[0] }, -ident),
             $self->expand_expr($_->[1]),
           ], @{$with->{queries}}
         ]
@@ -142,20 +146,20 @@ sub register_defaults {
     my @exp;
     while (my ($alias, $query) = splice @with, 0, 2) {
       push @exp, [
-        $self->$expand_alias($alias),
+        $self->expand_expr({ -alias => $alias }, -ident),
         $self->expand_expr($query)
       ];
     }
     return +(with => { ($type ? (type => $type) : ()), queries => \@exp });
   });
   $self->clause_expander('select.with_recursive', $with_expander);
-  $self->clause_renderer('select.with' => sub {
+  $self->clause_renderer('select.with' => my $with_renderer = sub {
     my ($self, undef, $with) = @_;
     my $q_part = $self->join_query_parts(', ',
       map {
         my ($alias, $query) = @$_;
         $self->join_query_parts(' ',
-            $self->_render_alias($alias),
+            $alias,
             $self->format_keyword('as'),
             $query,
         )
@@ -166,6 +170,12 @@ sub register_defaults {
       $q_part,
     );
   });
+  foreach my $stmt (qw(insert update delete)) {
+    $self->clauses_of($stmt => 'with', $self->clauses_of($stmt));
+    $self->clause_expander("${stmt}.$_", $with_expander)
+      for qw(with with_recursive);
+    $self->clause_renderer("${stmt}.with", $with_renderer);
+  }
 
   return $self;
 }
@@ -210,13 +220,13 @@ 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 => [
+    $proto{using} = [
       map [ $self->expand_expr($_, -ident) ],
         ref($using) eq 'ARRAY' ? @$using: $using
-    ] };
+    ];
   }
   my %ret = map +($_ => $self->expand_expr($proto{$_}, -ident)),
               sort keys %proto;
@@ -234,14 +244,14 @@ sub _render_join {
   my @parts = (
     $args->{from},
     $self->format_keyword(join '_', ($args->{type}||()), 'join'),
-    (map +($_->{-ident} || $_->{-as} ? $_ : { -row => [ $_ ] }), $args->{to}),
+    (map +($_->{-ident} || $_->{-as} ? $_ : ('(', $_, ')')), $args->{to}),
     ($args->{on} ? (
       $self->format_keyword('on') ,
       $args->{on},
     ) : ()),
     ($args->{using} ? (
       $self->format_keyword('using'),
-      $args->{using},
+      '(', $args->{using}, ')',
     ) : ()),
   );
   return $self->join_query_parts(' ', @parts);
@@ -249,24 +259,29 @@ sub _render_join {
 
 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, undef, $args) = @_;
-  my ($thing, @alias) = @$args;
+  my ($thing, $alias) = @$args;
   return $self->join_query_parts(
     ' ',
-    $self->render_aqt($thing),
+    $thing,
     $self->format_keyword('as'),
-    $self->_render_alias(\@alias),
+    $alias,
   );
 }
 
 sub _render_alias {
-  my ($self, $args) = @_;
+  my ($self, undef, $args) = @_;
   my ($as, @cols) = @$args;
   return (@cols
     ? $self->join_query_parts('',