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

diff --git a/lib/SQL/Abstract/ExtraClauses.pm b/lib/SQL/Abstract/ExtraClauses.pm
index 78680da..b874be5 100644
--- a/lib/SQL/Abstract/ExtraClauses.pm
+++ b/lib/SQL/Abstract/ExtraClauses.pm
@@ -27,6 +27,12 @@ sub new {
   $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;
 }
 
@@ -71,6 +77,12 @@ sub _expand_join {
   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 };
@@ -95,7 +107,7 @@ sub _render_join {
       )
     ],
     [ $self->render_aqt(
-        map +($_->{-ident} or $_->{-as} ? $_ : { -row => [ $_ ] }), $args->{to}
+        map +($_->{-ident} || $_->{-as} ? $_ : { -row => [ $_ ] }), $args->{to}
     ) ],
     ($args->{on} ? (
       [ $self->_sqlcase('on') ],