From: Peter Rabbitson Date: Fri, 30 May 2008 15:19:58 +0000 (+0000) Subject: Adjust prefetch tests to not blow up after r4434 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=6a1bce35be680932c595e85e2548b045faa5d86e;p=dbsrgits%2FDBIx-Class-Historic.git Adjust prefetch tests to not blow up after r4434 --- diff --git a/t/77prefetch.t b/t/77prefetch.t index 8b3f10c..1784f7c 100644 --- a/t/77prefetch.t +++ b/t/77prefetch.t @@ -16,7 +16,7 @@ BEGIN { eval "use DBD::SQLite"; plan $@ ? ( skip_all => 'needs DBD::SQLite for testing' ) - : ( tests => 50 ); + : ( tests => 58 ); } # figure out if we've got a version of sqlite that is older than 3.2.6, in @@ -346,7 +346,7 @@ is($queries, 0, 'chained search_related after has_many->has_many prefetch ran no # once the following TODO is complete, remove the 2 stop-gap tests immediately after the TODO block # (the TODO block itself contains tests ensuring that the stop-gaps are removed) -TODO: if (0) { # broken-ass todo block commented out by mst +TODO: { local $TODO = 'Prefetch of multiple has_many rels at the same level (currently must die to protect the clueless git)'; use DBIx::Class::ResultClass::HashRefInflator; @@ -368,16 +368,22 @@ TODO: if (0) { # broken-ass todo block commented out by mst $pr_tracks_rs = $pr_cd_rs->first->tracks; $pr_tracks_count = $pr_tracks_rs->count; }; - ok(! $@, 'exception on attempt to prefetch several same level has_many\'s (1 -> M + M)'); - is($queries, 1, 'prefetch one->(has_many,has_many) ran exactly 1 query'); - is($pr_tracks_count, $tracks_count, 'equal count of prefetched relations over several same level has_many\'s (1 -> M + M)'); + my $o_mm_exc = $@; + ok(! $o_mm_exc, 'exception on attempt to prefetch several same level has_many\'s (1 -> M + M)'); - for ($pr_tracks_rs, $tracks_rs) { - $_->result_class ('DBIx::Class::ResultClass::HashRefInflator'); - } + SKIP: { + skip "1 -> M + M prefetch died", 3 if $o_mm_exc; + + is($queries, 1, 'prefetch one->(has_many,has_many) ran exactly 1 query'); + is($pr_tracks_count, $tracks_count, 'equal count of prefetched relations over several same level has_many\'s (1 -> M + M)'); - is_deeply ([$pr_tracks_rs->all], [$tracks_rs->all], 'same structure returned with and without prefetch over several same level has_many\'s (1 -> M + M)'); + for ($pr_tracks_rs, $tracks_rs) { + $_->result_class ('DBIx::Class::ResultClass::HashRefInflator'); + } + + is_deeply ([$pr_tracks_rs->all], [$tracks_rs->all], 'same structure returned with and without prefetch over several same level has_many\'s (1 -> M + M)'); + }; #( M -> 1 -> M + M ) my $note_rs = $schema->resultset('LinerNotes')->search ({ notes => 'Buy Whiskey!' }); @@ -399,16 +405,23 @@ TODO: if (0) { # broken-ass todo block commented out by mst $pr_tags_rs = $pr_note_rs->first->cd->tags; $pr_tags_count = $pr_tags_rs->count; }; - ok(! $@, 'exception on attempt to prefetch several same level has_many\'s (M -> 1 -> M + M)'); - is($queries, 1, 'prefetch one->(has_many,has_many) ran exactly 1 query'); - is($pr_tags_count, $tags_count, 'equal count of prefetched relations over several same level has_many\'s (M -> 1 -> M + M)'); + my $m_o_mm_exc = $@; + ok(! $m_o_mm_exc, 'exception on attempt to prefetch several same level has_many\'s (M -> 1 -> M + M)'); - for ($pr_tags_rs, $tags_rs) { - $_->result_class ('DBIx::Class::ResultClass::HashRefInflator'); - } + SKIP: { + skip "M -> 1 -> M + M prefetch died", 3 if $m_o_mm_exc; + + is($queries, 1, 'prefetch one->(has_many,has_many) ran exactly 1 query'); - is_deeply ([$pr_tags_rs->all], [$tags_rs->all], 'same structure returned with and without prefetch over several same level has_many\'s (M -> 1 -> M + M)'); + is($pr_tags_count, $tags_count, 'equal count of prefetched relations over several same level has_many\'s (M -> 1 -> M + M)'); + + for ($pr_tags_rs, $tags_rs) { + $_->result_class ('DBIx::Class::ResultClass::HashRefInflator'); + } + + is_deeply ([$pr_tags_rs->all], [$tags_rs->all], 'same structure returned with and without prefetch over several same level has_many\'s (M -> 1 -> M + M)'); + }; }; eval { my $track = $schema->resultset('CD')->search ({ 'me.title' => 'Forkful of bees' }, { prefetch => [qw/tracks tags/] })->first->tracks->first };