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=829b1108817a72e691d9a0432164a6f3ff1518fe;hpb=eef0f2039477a1b18b7f95f689b602f0eca227d3;p=scpubgit%2FQ-Branch.git

diff --git a/lib/SQL/Abstract/Formatter.pm b/lib/SQL/Abstract/Formatter.pm
index 829b110..0f0daf3 100644
--- a/lib/SQL/Abstract/Formatter.pm
+++ b/lib/SQL/Abstract/Formatter.pm
@@ -9,15 +9,72 @@ has max_width => (is => 'ro', default => 78);
 
 sub _join {
   shift;
-  SQL::Abstract::Parts::stringify(\@_);
+  return SQL::Abstract::Parts::stringify(\@_);
 }
 
 sub format {
   my ($self, $join, @parts) = @_;
-  my $sql = $self->_join($join, @parts);
-  return $sql unless length($sql) > $self->max_width;
-  local $self->{max_width} = $self->{max_width} - length($self->indent_by);
-  return join("\n", map $self->format(@$_), @parts);
+  $self->_fold_sql('', '', @{$self->_simplify($join, @parts)});
+}
+
+sub _simplify {
+  my ($self, $join, @parts) = @_;
+  return '' unless @parts;
+  return $parts[0] if @parts == 1 and !ref($parts[0]);
+  return $self->_simplify(@{$parts[0]}) if @parts == 1;
+  return [ $join, map ref() ? $self->_simplify(@$_) : $_, @parts ];
+}
+
+sub _fold_sql {
+  my ($self, $indent0, $indent, $join, @parts) = @_;
+  my @res;
+  my $w = $self->max_width;
+  my $join_len = 0;
+  (s/, \Z/,\n/ and $join_len = 1)
+    or s/\A /\n/
+    or $_ = "\n"
+      for my $line_join = $join;
+  my ($nl_pre, $nl_post) = split "\n", $line_join;
+  my $line_orig = my $line = $indent0;
+  my $next_indent = $indent.$self->indent_by;
+  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($innerdent, $innerdent, @$inner);
+      $folded =~ s/\n\Z//;
+      push @res, $folded."\n";
+      $line_orig = $line
+         = $indent0.')'.($idx == $#parts ? '' : $join);
+      next PART;
+    }
+    if ($line ne $line_orig) {
+      push @res, $line.($idx == $#parts ? '' : $nl_pre)."\n";
+    }
+    if (length($line = $line_proto.$j) <= $w) {
+      next PART;
+    }
+    my $folded = $self->_fold_sql($line_proto, $innerdent, @$p);
+    $folded =~ s/\n\Z//;
+    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;
 }
 
 1;