X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FSQL%2FAbstract%2FExtraClauses.pm;h=b874be57e5c12d2fbe5e2f125f247ee46d3dff34;hb=e0eb8d26a5a2548ac7f015b66512981a730474ac;hp=a4da3d7b4b19c5d008e95afedece42ddc02f9e4f;hpb=7741b7ad9d94e2c060763b13ad5ce93764af6163;p=scpubgit%2FQ-Branch.git

diff --git a/lib/SQL/Abstract/ExtraClauses.pm b/lib/SQL/Abstract/ExtraClauses.pm
index a4da3d7..b874be5 100644
--- a/lib/SQL/Abstract/ExtraClauses.pm
+++ b/lib/SQL/Abstract/ExtraClauses.pm
@@ -24,6 +24,15 @@ sub new {
   $new->{render}{from_list} = '_render_from_list';
   $new->{expand}{join} = '_expand_join';
   $new->{render}{join} = '_render_join';
+  $new->{expand_op}{as} = '_expand_op_as';
+  $new->{expand}{as} = '_expand_op_as';
+  $new->{render}{as} = '_render_as';
+  splice(@{$new->{clauses_of}{update}}, 2, 0, 'from');
+  splice(@{$new->{clauses_of}{delete}}, 1, 0, 'using');
+  $new->{expand_clause}{'update.from'} = '_expand_select_clause_from';
+  $new->{expand_clause}{'delete.using'} = sub {
+    +(using => $_[0]->_expand_from_list(undef, $_[1]));
+  };
   return $new;
 }
 
@@ -40,7 +49,13 @@ sub _expand_from_list {
   my @list;
   my @args = ref($args) ? @$args : ($args);
   while (my $entry = shift @args) {
-    if (!ref($entry) and $entry =~ /^-/) {
+    if (!ref($entry) and $entry =~ /^-(.*)/) {
+      if ($1 eq 'as') {
+        $list[-1] = $self->expand_expr({ -as => [
+          $list[-1], map +(ref($_) eq 'ARRAY' ? @$_ : $_), shift(@args)
+        ]});
+        next;
+      }
       $entry = { $entry => shift @args };
     }
     my $aqt = $self->expand_expr($entry, -ident);
@@ -59,6 +74,15 @@ sub _expand_join {
       ? %$args
       : (to => $args->[0], @{$args}[1..$#$args])
   );
+  if (my $as = delete $proto{as}) {
+    $proto{to} = { -as => [ $proto{to}, ref($as) eq 'ARRAY' ? @$as : $as ] };
+  }
+  if (defined($proto{using}) and ref(my $using = $proto{using}) ne 'HASH') {
+    $proto{using} = { -row => [
+      map [ $self->expand_expr($_, -ident) ],
+        ref($using) eq 'ARRAY' ? @$using: $using
+    ] };
+  }
   my %ret = map +($_ => $self->expand_expr($proto{$_}, -ident)),
               sort keys %proto;
   return +{ -join => \%ret };
@@ -82,7 +106,9 @@ sub _render_join {
         .'join'
       )
     ],
-    [ $self->render_aqt($args->{to}) ],
+    [ $self->render_aqt(
+        map +($_->{-ident} || $_->{-as} ? $_ : { -row => [ $_ ] }), $args->{to}
+    ) ],
     ($args->{on} ? (
       [ $self->_sqlcase('on') ],
       [ $self->render_aqt($args->{on}) ],
@@ -95,4 +121,35 @@ sub _render_join {
   return $self->_join_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 };
+}
+
+sub _render_as {
+  my ($self, $args) = @_;
+  my ($thing, $as, @cols) = @$args;
+  return $self->_join_parts(
+    ' ',
+    [ $self->render_aqt(
+        map +($_->{-ident} ? $_ : { -row => [ $_ ] }), $thing
+    ) ],
+    [ $self->_sqlcase('as') ],
+    (@cols
+      ? [ $self->_join_parts('',
+            [ $self->render_aqt($as) ],
+            [ '(' ],
+            [ $self->_join_parts(
+                ', ',
+                map [ $self->render_aqt($_) ], @cols
+            ) ],
+            [ ')' ],
+        ) ]
+      : [ $self->render_aqt($as) ]
+    ),
+  );
+}
+
 1;