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 => 'squash_repeats' );
sub new {
my $class = shift;
+ my $args = shift;
- my $sqlat = SQL::Abstract::Tree->new(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 $show_progress = $args->{show_progress};
+
+ 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->squash_repeats($squash_repeats);
$self->_sqlat($sqlat);
+ $self->_last_sql('');
return $self
}
my $string = shift;
my $bindargs = shift || [];
+ 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->squash_repeats && $self->_last_sql eq $string) {
+ my ( $l, $r ) = @{ $sqlat->placeholder_surround };
+ $formatted = '... : ' . join(', ', map "$l$_$r", @$bindargs)
+ } else {
+ $self->_last_sql($string);
+ $formatted = $sqlat->format($string, $bindargs);
+ $formatted = "$formatted : " . join ', ', @{$bindargs}
+ unless $use_placeholders;
+ }
- $self->next::method($formatted, @_);
+ $self->next::method("$lw$formatted$lr", @_);
}
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;