it would help if I actually enabled with for non-select statements

[scpubgit/Q-Branch.git] / lib / SQL / Abstract / ExtraClauses.pm

diff --git a/lib/SQL/Abstract/ExtraClauses.pm b/lib/SQL/Abstract/ExtraClauses.pm
index 3467f23..2dafda1 100644 (file)
--- a/lib/SQL/Abstract/ExtraClauses.pm
+++ b/lib/SQL/Abstract/ExtraClauses.pm
@@ -153,7 +153,7 @@ sub register_defaults {
     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 {
@@ -170,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;
 }
@@ -217,10 +223,10 @@ sub _expand_join {
     $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;
@@ -238,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);