there is a lurking infinite loop in 01generate inserts but this is still better

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

diff --git a/lib/SQL/Abstract/Clauses.pm b/lib/SQL/Abstract/Clauses.pm
index 2dd9c4e..4379c6c 100644 (file)
--- a/lib/SQL/Abstract/Clauses.pm
+++ b/lib/SQL/Abstract/Clauses.pm
@@ -27,8 +27,7 @@ sub register_defaults {
   $self->{expand_clause}{'update.update'} = '_expand_update_clause_target';
   $self->{render_clause}{'update.target'} = sub {
     my ($self, undef, $target) = @_;
-    my ($sql, @bind) = $self->render_aqt($target);
-    ($self->_sqlcase('update ').$sql, @bind);
+    $self->join_query_parts(' ', $self->format_keyword('update'), $target);
   };
   $self->{clauses_of}{delete} = [ qw(target where returning) ];
   $self->{expand}{delete} = sub { shift->_expand_statement(@_) };
@@ -38,8 +37,7 @@ sub register_defaults {
   $self->{expand_clause}{"delete.from"} = '_expand_delete_clause_target';
   $self->{render_clause}{'delete.target'} = sub {
     my ($self, undef, $from) = @_;
-    my ($sql, @bind) = $self->render_aqt($from);
-    ($self->_sqlcase('delete from ').$sql, @bind);
+    $self->join_query_parts(' ', $self->format_keyword('delete from'), $from);
   };
   $self->{clauses_of}{insert} = [
     'target', 'fields', 'from', 'returning'
@@ -63,8 +61,7 @@ sub register_defaults {
   };
   $self->{render_clause}{'insert.target'} = sub {
     my ($self, undef, $from) = @_;
-    my ($sql, @bind) = $self->render_aqt($from);
-    ($self->_sqlcase('insert into ').$sql, @bind);
+    $self->join_query_parts(' ', $self->format_keyword('insert into'), $from);
   };
   $self->{render_clause}{'insert.from'} = sub {
     return $_[0]->render_aqt($_[2], 1);
@@ -74,6 +71,11 @@ sub register_defaults {
   $self->{expand}{exists} = sub {
     $_[0]->_expand_op(undef, [ exists => $_[2] ]);
   };
+  $self->{render}{convert_where} = sub {
+    my $self = shift;
+    local $self->{convert_where} = $self->{convert};
+    $self->render_aqt($_[1]);
+  };
   return $self;
 }
 
@@ -89,7 +91,8 @@ sub _expand_select_clause_from {
 
 sub _expand_select_clause_where {
   my ($self, undef, $where) = @_;
-  +(where => $self->expand_expr($where));
+  my $exp = $self->expand_expr($where);
+  +(where => ($self->{convert} ? +{ -convert_where => $exp } : $exp));
 }
 
 sub _expand_select_clause_order_by {
@@ -153,8 +156,7 @@ sub _render_statement {
   my @parts;
   foreach my $clause (@{$self->{clauses_of}{$type}}) {
     next unless my $clause_expr = $args->{$clause};
-    local $self->{convert_where} = $self->{convert} if $clause eq 'where';
-    my ($sql) = my @part = do {
+    my @part = do {
       if (my $rdr = $self->{render_clause}{"${type}.${clause}"}) {
         $self->$rdr($clause, $clause_expr);
       } else {
@@ -165,10 +167,9 @@ sub _render_statement {
         ($sql, @bind);
       }
     };
-    next unless defined($sql) and length($sql);
     push @parts, \@part;
   }
-  my ($sql, @bind) = $self->join_clauses(' ', @parts);
+  my ($sql, @bind) = $self->join_query_parts(' ', @parts);
   return (
     (our $Render_Top_Level ? $sql : '('.$sql.')'),
     @bind
@@ -264,15 +265,16 @@ sub _expand_values {
 
 sub _render_values {
   my ($self, undef, $values) = @_;
-  my ($v_sql, @bind) = $self->join_clauses(
-    ', ',
-    map [ $self->render_aqt($_) ],
-      ref($values) eq 'ARRAY' ? @$values : $values
-  );
-  my $sql = $self->_sqlcase('values').' '.$v_sql;
-  return (
-    (our $Render_Top_Level ? $sql : '('.$sql.')'),
-    @bind
+  my $inner = [
+    $self->join_query_parts(' ',
+      $self->format_keyword('values'),
+      [ $self->join_query_parts(', ',
+        ref($values) eq 'ARRAY' ? @$values : $values
+      ) ],
+    ),
+  ];
+  return $self->join_query_parts('',
+    (our $Render_Top_Level ? $inner : ('(', $inner, ')'))
   );
 }