use strict;
-use warnings;
+use warnings;
use Test::More;
+use Test::Exception;
use lib qw(t/lib);
use DBICTest;
use DBIC::DebugObj;
my $schema = DBICTest->init_schema();
+# make sure we are testing the vanilla debugger and not ::PrettyPrint
+$schema->storage->debugobj(DBIx::Class::Storage::Statistics->new);
ok ( $schema->storage->debug(1), 'debug' );
$schema->storage->debugfh(file('t/var/sql.log')->openw);
my $log = file('t/var/sql.log')->openr;
my $line = <$log>;
$log->close();
-ok($line =~ /^SELECT COUNT/, 'Log success');
+like($line, qr/^SELECT COUNT/, 'Log success');
$schema->storage->debugfh(undef);
$ENV{'DBIC_TRACE'} = '=t/var/foo.log';
$log = file('t/var/foo.log')->openr;
$line = <$log>;
$log->close();
-ok($line =~ /^SELECT COUNT/, 'Log success');
+like($line, qr/^SELECT COUNT/, 'Log success');
$schema->storage->debugobj->debugfh(undef);
delete($ENV{'DBIC_TRACE'});
+
open(STDERRCOPY, '>&STDERR');
stat(STDERRCOPY); # nop to get warnings quiet
close(STDERR);
-eval {
+dies_ok {
$rs = $schema->resultset('CD')->search({});
$rs->count();
-};
-ok($@, 'Died on closed FH');
+} 'Died on closed FH';
+
open(STDERR, '>&STDERRCOPY');
# test trace output correctness for bind params
my @cds = $schema->resultset('CD')->search( { artist => 1, cdid => { -between => [ 1, 3 ] }, } );
is_same_sql_bind(
$sql, \@bind,
- "SELECT me.cdid, me.artist, me.title, me.year, me.genreid, me.single_track FROM cd me WHERE ( artist = ? AND (cdid BETWEEN ? AND ?) ): '1', '1', '3'",
+ "SELECT me.cdid, me.artist, me.title, me.year, me.genreid, me.single_track FROM cd me WHERE ( artist = ? AND (cdid BETWEEN ? AND ?) )",
[qw/'1' '1' '3'/],
'got correct SQL with all bind parameters (debugcb)'
);