X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F77prefetch.t;h=3fb4824d83cc0c9a570ecf135978f84586ee05eb;hb=61177e4410737d15901ed2f25d3fe5ea99d525ad;hp=a7834babf361b2406a1dd47d250f395ba8b04cfe;hpb=aae8ca08d65518a4c076746a858f9a5f76f1dff1;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/77prefetch.t b/t/77prefetch.t
index a7834ba..3fb4824 100644
--- a/t/77prefetch.t
+++ b/t/77prefetch.t
@@ -368,16 +368,22 @@ TODO: {
         $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: {
         $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 };