Add EXECUTING for clarity of long running SQL

[scpubgit/Q-Branch.git] / lib / DBIx / Class / Storage / Debug / PrettyPrint.pm

diff --git a/lib/DBIx/Class/Storage/Debug/PrettyPrint.pm b/lib/DBIx/Class/Storage/Debug/PrettyPrint.pm
index 1fbedcf..8569dbc 100644 (file)
--- a/lib/DBIx/Class/Storage/Debug/PrettyPrint.pm
+++ b/lib/DBIx/Class/Storage/Debug/PrettyPrint.pm
@@ -1,29 +1,79 @@
 package DBIx::Class::Storage::Debug::PrettyPrint;
 
+use strict;
+use warnings;
+
 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' );
 
 sub new {
    my $class = shift;
+   my $args  = shift;
+
+   my $clear_line = $args->{clear_line} || "\r\e[J";
+   my $executing  = $args->{executing}  || eval { require Term::ANSIColor } ? do {
+       my $c = \&Term::ANSIColor::color;
+       $c->('blink white on_black') . 'EXECUTING...' . $c->('reset');;
+   } : 'EXECUTING...';
+;
 
-   my $sqlat = SQL::Abstract::Tree->new(shift @_);
+   my $sqlat = SQL::Abstract::Tree->new($args);
    my $self = $class->next::method(@_);
+   $self->clear_line_str($clear_line);
+   $self->executing_str($executing);
 
    $self->_sqlat($sqlat);
 
    return $self
 }
 
-sub query_start {
+sub print {
   my $self = shift;
   my $string = shift;
+  my $bindargs = shift || [];
+
+  my ($lw, $lr);
+  ($lw, $string, $lr) = $string =~ /^(\s*)(.+?)(\s*)$/s;
+
+  return 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);
+
+  $formatted = "$formatted: " . join ', ', @{$bindargs}
+     unless $use_placeholders;
 
-  my $formatted = $self->_sqlat->format($string);
+  $self->next::method("$lw$formatted$lr", @_);
+}
+
+sub query_start {
+  my ($self, $string, @bind) = @_;
+
+  if(defined $self->callback) {
+    $string =~ m/^(\w+)/;
+    $self->callback->($1, "$string: ".join(', ', @bind)."\n");
+    return;
+  }
+
+  $string =~ s/\s+$//;
+
+  $self->print("$string\n", \@bind);
+
+  $self->debugfh->print($self->executing_str)
+}
 
-  $self->next::method($formatted, @_);
+sub query_end {
+  $_[0]->debugfh->print($_[0]->clear_line_str);
 }
 
 1;