X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FStorage%2FDebug%2FPrettyPrint.pm;h=251d03d6e5707c274c8986ce2f2c5780798499f5;hb=ca4f826a37ccb5194b0b5b9b4190b4007d647d9c;hp=59ffe420e65dfcf1e4a2ae24ccc29f680ce7d4cd;hpb=2924f8b3ce58b66565f0e733b9daeba416cbf74a;p=dbsrgits%2FSQL-Abstract.git

diff --git a/lib/DBIx/Class/Storage/Debug/PrettyPrint.pm b/lib/DBIx/Class/Storage/Debug/PrettyPrint.pm
index 59ffe42..251d03d 100644
--- a/lib/DBIx/Class/Storage/Debug/PrettyPrint.pm
+++ b/lib/DBIx/Class/Storage/Debug/PrettyPrint.pm
@@ -18,7 +18,7 @@ sub new {
    my $class = shift;
    my $args  = shift;
 
-   my $clear_line = $args->{clear_line} || "\r";
+   my $clear_line = $args->{clear_line} || "\r\x1b[J";
    my $executing  = $args->{executing}  || (
       eval { require Term::ANSIColor } ? do {
           my $c = \&Term::ANSIColor::color;
@@ -55,9 +55,6 @@ sub print {
 
   my $use_placeholders = !!$self->_sqlat->fill_in_placeholders;
 
-  # DBIC pre-quotes bindargs
-  $bindargs = [map { s/^'//; s/'$//; $_ } @{$bindargs}] if $use_placeholders;
-
   my $sqlat = $self->_sqlat;
   my $formatted;
   if ($self->squash_repeats && $self->_last_sql eq $string) {
@@ -76,7 +73,7 @@ sub print {
 sub query_start {
   my ($self, $string, @bind) = @_;
 
-  if(defined $self->callback) {
+  if (defined $self->callback) {
     $string =~ m/^(\w+)/;
     $self->callback->($1, "$string: ".join(', ', @bind)."\n");
     return;
@@ -97,6 +94,10 @@ sub query_end {
 
 =pod
 
+=head1 NAME
+
+DBIx::Class::Storage::Debug::PrettyPrint - Pretty Printing DebugObj
+
 =head1 SYNOPSIS
 
  DBIC_TRACE_PROFILE=~/dbic.json perl -Ilib ./foo.pl
@@ -114,17 +115,17 @@ Where dbic.json contains:
 =head2 new
 
  my $pp = DBIx::Class::Storage::Debug::PrettyPrint->new({
-   show_progress  => 1,        # tries it's best to make it clear that a SQL
-                               # statement is still running
-   executing      => '...',    # the string that is added to the end of SQL
-                               # if show_progress is on.  You probably don't
-                               # need to set this
-   clear_line     => '\r^[[J', # the string used to erase the string added
-                               # to SQL if show_progress is on.  Again, the
-                               # default is probably good enough.
-
-   squash_repeats => 1,        # set to true to make repeated SQL queries
-                               # be ellided and only show the new bind params
+   show_progress  => 1,             # tries it's best to make it clear that a SQL
+                                    # statement is still running
+   executing      => '...',         # the string that is added to the end of SQL
+                                    # if show_progress is on.  You probably don't
+                                    # need to set this
+   clear_line     => '<CR><ESC>[J', # the string used to erase the string added
+                                    # to SQL if show_progress is on.  Again, the
+                                    # default is probably good enough.
+
+   squash_repeats => 1,             # set to true to make repeated SQL queries
+                                    # be ellided and only show the new bind params
    # any other args are passed through directly to SQL::Abstract::Tree
  });