X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FStorage%2FDebug%2FPrettyPrint.pm;h=d76477fcabe8be0980cebdcdcf4ea0b92ae1681a;hb=b25246f02c8f12fc5c060f53f2386db8bcca05ab;hp=affb422bdf5832fc15d8d0ef7b2fe55d7a65a3ef;hpb=fab0bed9d6f7c688660726c1f23448c136ba222b;p=dbsrgits%2FSQL-Abstract.git

diff --git a/lib/DBIx/Class/Storage/Debug/PrettyPrint.pm b/lib/DBIx/Class/Storage/Debug/PrettyPrint.pm
index affb422..d76477f 100644
--- a/lib/DBIx/Class/Storage/Debug/PrettyPrint.pm
+++ b/lib/DBIx/Class/Storage/Debug/PrettyPrint.pm
@@ -8,14 +8,34 @@ use base 'DBIx::Class::Storage::Statistics';
 use SQL::Abstract::Tree;
 
 __PACKAGE__->mk_group_accessors( simple => '_sqlat' );
+__PACKAGE__->mk_group_accessors( simple => '_clear_line_str' );
+__PACKAGE__->mk_group_accessors( simple => '_executing_str' );
+__PACKAGE__->mk_group_accessors( simple => '_show_progress' );
+__PACKAGE__->mk_group_accessors( simple => '_last_sql' );
+__PACKAGE__->mk_group_accessors( simple => 'no_repeats' );
 
 sub new {
    my $class = shift;
+   my $args  = shift;
 
-   my $sqlat = SQL::Abstract::Tree->new(shift @_);
+   my $clear_line = $args->{clear_line} || "\r";
+   my $executing  = $args->{executing}  || eval { require Term::ANSIColor } ? do {
+       my $c = \&Term::ANSIColor::color;
+       $c->('blink white on_black') . 'EXECUTING...' . $c->('reset');;
+   } : 'EXECUTING...';
+   my $show_progress = defined $args->{show_progress} ? $args->{show_progress} : 1;
+
+   my $no_repeats = $args->{no_repeats};
+   my $sqlat = SQL::Abstract::Tree->new($args);
    my $self = $class->next::method(@_);
+   $self->_clear_line_str($clear_line);
+   $self->_executing_str($executing);
+   $self->_show_progress($show_progress);
+
+   $self->no_repeats($no_repeats);
 
    $self->_sqlat($sqlat);
+   $self->_last_sql('');
 
    return $self
 }
@@ -25,20 +45,30 @@ sub print {
   my $string = shift;
   my $bindargs = shift || [];
 
-  return if defined $bindargs && defined $bindargs->[0] &&
-    $bindargs->[0] eq q('__BULK_INSERT__');
+  my ($lw, $lr);
+  ($lw, $string, $lr) = $string =~ /^(\s*)(.+?)(\s*)$/s;
+
+  local $self->_sqlat->{fill_in_placeholders} = 0 if defined $bindargs
+    && defined $bindargs->[0] && $bindargs->[0] eq q('__BULK_INSERT__');
 
   my $use_placeholders = !!$self->_sqlat->fill_in_placeholders;
 
   # DBIC pre-quotes bindargs
   $bindargs = [map { s/^'//; s/'$//; $_ } @{$bindargs}] if $use_placeholders;
 
-  my $formatted = $self->_sqlat->format($string, $bindargs) . "\n";
-
-  $formatted = "$formatted: " . join ', ', @{$bindargs}
-     unless $use_placeholders;
+  my $sqlat = $self->_sqlat;
+  my $formatted;
+  if ($self->no_repeats && $self->_last_sql eq $string) {
+     my ( $l, $r ) = @{ $sqlat->placeholder_surround };
+     $formatted = '... : ' . join(', ', map "$l$_$r", @$bindargs) . "\n";
+  } else {
+     $self->_last_sql($string);
+     $formatted = $sqlat->format($string, $bindargs) . "\n";
+     $formatted = "$formatted: " . join ', ', @{$bindargs}
+        unless $use_placeholders;
+  }
 
-  $self->next::method($formatted, @_);
+  $self->next::method("$lw$formatted$lr", @_);
 }
 
 sub query_start {
@@ -50,7 +80,15 @@ sub query_start {
     return;
   }
 
-  $self->print($string, \@bind);
+  $string =~ s/\s+$//;
+
+  $self->print("$string\n", \@bind);
+
+  $self->debugfh->print($self->_executing_str) if $self->_show_progress
+}
+
+sub query_end {
+  $_[0]->debugfh->print($_[0]->_clear_line_str) if $_[0]->_show_progress
 }
 
 1;