tests for bulk insert

[dbsrgits/SQL-Abstract.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 d76477f..65e95bd 100644 (file)
--- a/lib/DBIx/Class/Storage/Debug/PrettyPrint.pm
+++ b/lib/DBIx/Class/Storage/Debug/PrettyPrint.pm
@@ -12,7 +12,7 @@ __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' );
+__PACKAGE__->mk_group_accessors( simple => 'squash_repeats' );
 
 sub new {
    my $class = shift;
@@ -23,16 +23,16 @@ sub new {
        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 $show_progress = $args->{show_progress};
 
-   my $no_repeats = $args->{no_repeats};
+   my $squash_repeats = $args->{squash_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->squash_repeats($squash_repeats);
 
    $self->_sqlat($sqlat);
    $self->_last_sql('');
@@ -58,13 +58,13 @@ sub print {
 
   my $sqlat = $self->_sqlat;
   my $formatted;
-  if ($self->no_repeats && $self->_last_sql eq $string) {
+  if ($self->squash_repeats && $self->_last_sql eq $string) {
      my ( $l, $r ) = @{ $sqlat->placeholder_surround };
-     $formatted = '... : ' . join(', ', map "$l$_$r", @$bindargs) . "\n";
+     $formatted = '... : ' . join(', ', map "$l$_$r", @$bindargs)
   } else {
      $self->_last_sql($string);
-     $formatted = $sqlat->format($string, $bindargs) . "\n";
-     $formatted = "$formatted: " . join ', ', @{$bindargs}
+     $formatted = $sqlat->format($string, $bindargs);
+     $formatted = "$formatted : " . join ', ', @{$bindargs}
         unless $use_placeholders;
   }