Revert workarounds for $@ broken during 5.13.x - mainly 1f870d5a

[dbsrgits/DBIx-Class.git] / t / count / joined.t

diff --git a/t/count/joined.t b/t/count/joined.t
index 3f0b514..352eef9 100644 (file)
--- a/t/count/joined.t
+++ b/t/count/joined.t
@@ -7,7 +7,7 @@ use lib qw(t/lib);
 
 use DBICTest;
 
-plan tests => 5;
+plan tests => 7;
 
 my $schema = DBICTest->init_schema();
 
@@ -26,10 +26,12 @@ is (
   "Count correct with requested distinct collapse of main table"
 );
 
+# JOIN and LEFT JOIN issues mean that we've seen problems where counted rows and fetched rows are sometimes 1 higher than they should
+# be in the related resultset.
 my $artist=$schema->resultset('Artist')->create({name => 'xxx'});
-is($artist->related_resultset('cds')->count(), 0,
-   "No CDs found for a shiny new artist");
-my $artist_rs = $schema->resultset('Artist')->search({artistid => $artist->id});
-is($artist_rs->related_resultset('cds')->count(), 0,
-   "No CDs found for a shiny new artist using a resultset search");
+is($artist->related_resultset('cds')->count(), 0, "No CDs found for a shiny new artist");
+is(scalar($artist->related_resultset('cds')->all()), 0, "No CDs fetched for a shiny new artist");
 
+my $artist_rs = $schema->resultset('Artist')->search({artistid => $artist->id});
+is($artist_rs->related_resultset('cds')->count(), 0, "No CDs counted for a shiny new artist using a resultset search");
+is(scalar($artist_rs->related_resultset('cds')->all), 0, "No CDs fetched for a shiny new artist using a resultset search");