squash_repeats > no_repeats

diff --git a/Changes b/Changes
index ea6689a..65f990d 100644 (file)
--- a/Changes
+++ b/Changes
@@ -3,7 +3,7 @@ Revision history for SQL::Abstract
     - Hide bulk inserts from DBIx::Class
     - Highlight transaction keywords
     - Add EXECUTING for clarity of long running SQL
-    - Add "no_repeats" option to fix it such that repeated SQL gets ellided
+    - Add "squash_repeats" option to fix it such that repeated SQL gets ellided
       except for placeholders
 
 revision 1.69  2010-10-22

diff --git a/lib/DBIx/Class/Storage/Debug/PrettyPrint.pm b/lib/DBIx/Class/Storage/Debug/PrettyPrint.pm
index d76477f..ea40e97 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;
@@ -25,14 +25,14 @@ sub new {
    } : 'EXECUTING...';
    my $show_progress = defined $args->{show_progress} ? $args->{show_progress} : 1;
 
-   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,7 +58,7 @@ 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";
   } else {

diff --git a/t/dbic/no-repeats.t b/t/dbic/no-repeats.t
index fd53867..1ec4c53 100644 (file)
--- a/t/dbic/no-repeats.t
+++ b/t/dbic/no-repeats.t
@@ -9,7 +9,7 @@ open my $fh, '>', \$cap;
 
 my $pp = DBIx::Class::Storage::Debug::PrettyPrint->new({
    profile => 'none',
-   no_repeats => 1,
+   squash_repeats => 1,
    fill_in_placeholders => 1,
    placeholder_surround => [qw(' ')],
    show_progress => 0,