X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Frun%2F16joins.tl;h=c83aa7c0357e2bea65862f0d97201592ab5f9c85;hb=9d29cf57a7ed1b68277ff2b7ee58d46112d8c384;hp=5ea8749dc9a2b07f48030607e9bc5730fa70b3e4;hpb=6991aba3b8b1b3187ff96a2f10120a895e1e5646;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/run/16joins.tl b/t/run/16joins.tl
index 5ea8749..c83aa7c 100644
--- a/t/run/16joins.tl
+++ b/t/run/16joins.tl
@@ -7,7 +7,7 @@ BEGIN {
     eval "use DBD::SQLite";
     plan $@
         ? ( skip_all => 'needs DBD::SQLite for testing' )
-        : ( tests => 41 );
+        : ( tests => 42 );
 }
 
 # figure out if we've got a version of sqlite that is older than 3.2.6, in
@@ -73,7 +73,7 @@ my $rs = $schema->resultset("CD")->search(
                          ] ] }
          );
 
-cmp_ok( $rs->count, '==', 1, "Single record in resultset");
+cmp_ok( $rs + 0, '==', 1, "Single record in resultset");
 
 is($rs->first->title, 'Forkful of bees', 'Correct record returned');
 
@@ -81,7 +81,7 @@ $rs = $schema->resultset("CD")->search(
            { 'year' => 2001, 'artist.name' => 'Caterwauler McCrae' },
            { join => 'artist' });
 
-cmp_ok( $rs->count, '==', 1, "Single record in resultset");
+cmp_ok( $rs + 0, '==', 1, "Single record in resultset");
 
 is($rs->first->title, 'Forkful of bees', 'Correct record returned');
 
@@ -90,7 +90,7 @@ $rs = $schema->resultset("CD")->search(
              'liner_notes.notes' => 'Kill Yourself!' },
            { join => [ qw/artist liner_notes/ ] });
 
-cmp_ok( $rs->count, '==', 1, "Single record in resultset");
+cmp_ok( $rs + 0, '==', 1, "Single record in resultset");
 
 is($rs->first->title, 'Come Be Depressed With Us', 'Correct record returned');
 
@@ -114,11 +114,13 @@ $rs = $schema->resultset("CD")->search(
            { prefetch => [ qw/artist liner_notes/ ],
              order_by => 'me.cdid' });
 
-cmp_ok($rs->count, '==', 3, 'Correct number of records returned');
+cmp_ok($rs + 0, '==', 3, 'Correct number of records returned');
 
-# start test for prefetch SELECT count
-unlink 't/var/dbic.trace' if -e 't/var/dbic.trace';
-DBI->trace(1, 't/var/dbic.trace');
+my $queries = 0;
+$schema->storage->debugcb(sub { $queries++ });
+
+$queries = 0;
+$schema->storage->debug(1);
 
 my @cd = $rs->all;
 
@@ -132,30 +134,22 @@ is(ref $cd[1]->liner_notes, 'DBICTest::LinerNotes', 'Prefetch returns correct cl
 
 is($cd[2]->{_inflated_column}{artist}->name, 'Caterwauler McCrae', 'Prefetch on parent object ok');
 
-# count the SELECTs
-DBI->trace(0, undef);
-my $selects = 0;
-my $trace = IO::File->new('t/var/dbic.trace', '<') 
-    or die "Unable to read trace file";
-while (<$trace>) {
-    $selects++ if /SELECT/;
-}
-$trace->close;
-unlink 't/var/dbic.trace';
-is($selects, 1, 'prefetch ran only 1 select statement');
+is($queries, 1, 'prefetch ran only 1 select statement');
+
+$schema->storage->debug(0);
 
-# test for partial prefetch via cols attr
+# test for partial prefetch via columns attr
 my $cd = $schema->resultset('CD')->find(1,
     {
-      cols => [qw/title artist.name/], 
+      columns => [qw/title artist.name/], 
       join => { 'artist' => {} }
     }
 );
 ok(eval { $cd->artist->name eq 'Caterwauler McCrae' }, 'single related column prefetched');
 
 # start test for nested prefetch SELECT count
-unlink 't/var/dbic.trace' if -e 't/var/dbic.trace';
-DBI->trace(1, 't/var/dbic.trace');
+$queries = 0;
+$schema->storage->debug(1);
 
 $rs = $schema->resultset('Tag')->search(
   {},
@@ -171,36 +165,18 @@ is( $tag->cd->title, 'Spoonful of bees', 'step 1 ok for nested prefetch' );
 is( $tag->cd->artist->name, 'Caterwauler McCrae', 'step 2 ok for nested prefetch');
 
 # count the SELECTs
-DBI->trace(0, undef);
-$selects = 0;
-$trace = IO::File->new('t/var/dbic.trace', '<') 
-    or die "Unable to read trace file";
-while (<$trace>) {
-    $selects++ if /SELECT(?!.*WHERE 1=0.*)/;
-}
-$trace->close;
-unlink 't/var/dbic.trace';
-is($selects, 1, 'nested prefetch ran exactly 1 select statement (excluding column_info)');
+#$selects++ if /SELECT(?!.*WHERE 1=0.*)/;
+is($queries, 1, 'nested prefetch ran exactly 1 select statement (excluding column_info)');
 
-# start test for prefetch on find SELECT count
-unlink 't/var/dbic.trace' if -e 't/var/dbic.trace';
-DBI->trace(1, 't/var/dbic.trace');
+$queries = 0;
 
 $cd = $schema->resultset('CD')->find(1, { prefetch => 'artist' });
 
 is($cd->{_inflated_column}{artist}->name, 'Caterwauler McCrae', 'artist prefetched correctly on find');
 
-# count the SELECTs
-DBI->trace(0, undef);
-$selects = 0;
-$trace = IO::File->new('t/var/dbic.trace', '<') 
-    or die "Unable to read trace file";
-while (<$trace>) {
-    $selects++ if /SELECT(?!.*WHERE 1=0.*)/;
-}
-$trace->close;
-unlink 't/var/dbic.trace';
-is($selects, 1, 'find with prefetch ran exactly 1 select statement (excluding column_info)');
+is($queries, 1, 'find with prefetch ran exactly 1 select statement (excluding column_info)');
+
+$schema->storage->debug(0);
 
 $rs = $schema->resultset('Tag')->search(
   {},
@@ -253,24 +229,16 @@ SKIP: {
     cmp_ok( $rs->count, '==', 3, "count() ok after group_by on related column" );
 }
 
-$rs = $schema->resultset("CD")->search(
+$rs = $schema->resultset("Artist")->search(
   {},
-      { join => [qw/ artist /], group_by => [qw/ artist.name /], having =>{ 'MAX(cd.id)'=>{'<',5 } } }
+      { join => [qw/ cds /], group_by => [qw/ me.name /], having =>{ 'MAX(cds.cdid)'=> \'< 5' } }
 );
 
-SKIP: {
-    skip "SQLite < 3.2.6 doesn't understand COUNT(DISTINCT())", 1
-        if $is_broken_sqlite;
-    cmp_ok( $rs->count, '==', 2, "count() ok after group_by on related column with a having" );
-}
+cmp_ok( $rs->all, '==', 2, "results ok after group_by on related column with a having" );
 
-$rs = $rs->search( {1=>1}, {  having =>{ 'count(*)'=>{'>',2 } }});
+$rs = $rs->search( undef, {  having =>{ 'count(*)'=> \'> 2' }});
 
-SKIP: {
-    skip "SQLite < 3.2.6 doesn't understand COUNT(DISTINCT())", 1
-        if $is_broken_sqlite;
-    cmp_ok( $rs->count, '==', 1, "count() ok after group_by on related column with a having" );
-}
+cmp_ok( $rs->all, '==', 1, "count() ok after group_by on related column with a having" );
 
 $rs = $schema->resultset("Artist")->search(
         { 'cds.title' => 'Spoonful of bees',
@@ -285,8 +253,7 @@ SKIP: {
 
 is($rs->next->name, 'Caterwauler McCrae', "Correct artist returned");
 
-my $queries;
-$schema->storage->debugcb(sub { $queries++ });
+$queries = 0;
 $schema->storage->debug(1);
 
 my $tree_like =