X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F91debug.t;h=bb55aba58c6eeb34ca4d65b4229da5c0e013922e;hb=6841b05987991821762189d7fe0d92f2e4789c70;hp=46f7c0dc30dd4886091dd1aba608b78f983d3eae;hpb=e5d9ee92012fbc63463ba5b77dc1d5fc4f5be743;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/91debug.t b/t/91debug.t
index 46f7c0d..bb55aba 100644
--- a/t/91debug.t
+++ b/t/91debug.t
@@ -4,10 +4,12 @@ use warnings;
 use Test::More;
 use lib qw(t/lib);
 use DBICTest;
+use DBIC::DebugObj;
+use DBIC::SqlMakerTest;
 
 my $schema = DBICTest->init_schema();
 
-plan tests => 6;
+plan tests => 7;
 
 ok ( $schema->storage->debug(1), 'debug' );
 ok ( defined(
@@ -18,6 +20,7 @@ ok ( defined(
      'debugfh'
    );
 
+$schema->storage->debugfh->autoflush(1);
 my $rs = $schema->resultset('CD')->search({});
 $rs->count();
 
@@ -34,7 +37,6 @@ $log = new IO::File('t/var/foo.log', 'r') or die($!);
 $line = <$log>;
 $log->close();
 ok($line =~ /^SELECT COUNT/, 'Log success');
-
 $schema->storage->debugobj->debugfh(undef);
 delete($ENV{'DBIC_TRACE'});
 open(STDERRCOPY, '>&STDERR');
@@ -49,14 +51,22 @@ open(STDERR, '>&STDERRCOPY');
 
 # test trace output correctness for bind params
 {
-    my $sql = '';
-    $schema->storage->debugcb( sub { $sql = $_[1] } );
+    my ($sql, @bind);
+    $schema->storage->debugobj(DBIC::DebugObj->new(\$sql, \@bind));
 
     my @cds = $schema->resultset('CD')->search( { artist => 1, cdid => { -between => [ 1, 3 ] }, } );
-    like(
-        $sql,
-        qr/\QSELECT me.cdid, me.artist, me.title, me.year FROM cd me WHERE ( artist = ? AND cdid BETWEEN ? AND ? ): '1', '1', '3'\E/,
-        'got correct SQL with all bind parameters'
+    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'",
+        [qw/'1' '1' '3'/],
+        'got correct SQL with all bind parameters (debugcb)'
+    );
+
+    @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'"],
+        'got correct SQL with all bind parameters (debugobj)'
     );
 }