X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FSQL%2FAbstract%2FFormatter.pm;h=0f0daf31640debd50265845dad089f7cfda2945c;hb=116bc0b69bc3d55647a4e195cf212a6af38ba5b8;hp=2404d8208b9fa61252c52b4fa8092e97989c3ab4;hpb=04fca5d23748f5fb32ab99364cc3da35a942c922;p=scpubgit%2FQ-Branch.git

diff --git a/lib/SQL/Abstract/Formatter.pm b/lib/SQL/Abstract/Formatter.pm
index 2404d82..0f0daf3 100644
--- a/lib/SQL/Abstract/Formatter.pm
+++ b/lib/SQL/Abstract/Formatter.pm
@@ -40,35 +40,39 @@ sub _fold_sql {
   my $line_proto = $indent.$nl_post;
   PART: foreach my $idx (0..$#parts) {
     my $p = $parts[$idx];
+#::DwarnT STARTPART => $p, \@res, $line, $line_orig;
     my $pre = ($line ne $line_orig ? $join : '');
     my $j_part = $pre.(my $j = ref($p) ? $self->_join(@$p) : $p);
     if (length($j_part) + length($line) + $join_len <= $w) {
       $line .= $j_part;
       next PART;
     }
+    my $innerdent = @res
+                      ? $next_indent
+                      : $indent0.$self->indent_by;
     if (ref($p) and $p->[1] eq '(' and $p->[-1] eq ')') {
       my $already = !($line eq $indent0 or $line eq $line_orig);
       push @res, $line.($already ? $join : '').'('."\n";
       my (undef, undef, $inner) = @$p;
-      my $folded = $self->_fold_sql($next_indent, $next_indent, @$inner);
+      my $folded = $self->_fold_sql($innerdent, $innerdent, @$inner);
       $folded =~ s/\n\Z//;
       push @res, $folded."\n";
       $line_orig = $line
-         = $indent0.')'.(
-           ($nl_post and $idx < $#parts) ? $nl_post : ''
-         );
+         = $indent0.')'.($idx == $#parts ? '' : $join);
       next PART;
     }
-    push @res, $line.$nl_pre."\n" if $line ne $line_orig;
+    if ($line ne $line_orig) {
+      push @res, $line.($idx == $#parts ? '' : $nl_pre)."\n";
+    }
     if (length($line = $line_proto.$j) <= $w) {
-      $line_proto = $line;
       next PART;
     }
-    my $innerdent = @res ? $indent : $next_indent;
     my $folded = $self->_fold_sql($line_proto, $innerdent, @$p);
     $folded =~ s/\n\Z//;
-    push @res, $folded.$nl_pre."\n";
+    push @res, $folded.($idx == $#parts ? '' : $nl_pre)."\n";
     $line_orig = $line = $idx == $#parts ? '' : $line_proto;
+  } continue {
+#::DwarnT ENDPART => $parts[$idx], \@res, $line, $line_orig;
   }
   return join '', @res, $line;
 }