X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F77prefetch.t;h=a91c429fafa09b9fa8bc3ab6f5af9ded7a723d85;hb=e0b438fbf183279ad1dc824d52ead5102bf3cb20;hp=1784f7c7198dfeee4ddb4304f9bd1b3891b9f54a;hpb=6a1bce35be680932c595e85e2548b045faa5d86e;p=dbsrgits%2FDBIx-Class-Historic.git

diff --git a/t/77prefetch.t b/t/77prefetch.t
index 1784f7c..a91c429 100644
--- a/t/77prefetch.t
+++ b/t/77prefetch.t
@@ -69,7 +69,7 @@ $schema->storage->debugobj->callback(undef);
 # test for partial prefetch via columns attr
 my $cd = $schema->resultset('CD')->find(1,
     {
-      columns => [qw/title artist.name/], 
+      columns => [qw/title artist artist.name/], 
       join => { 'artist' => {} }
     }
 );
@@ -227,7 +227,7 @@ $schema->storage->debugcb(sub { $queries++ });
 $schema->storage->debug(1);
 
 my $tree_like =
-     $schema->resultset('TreeLike')->find(4,
+     $schema->resultset('TreeLike')->find(5,
        { join     => { parent => { parent => 'parent' } },
          prefetch => { parent => { parent => 'parent' } } });
 
@@ -244,21 +244,21 @@ $schema->storage->debugobj->callback(undef);
 
 cmp_ok($queries, '==', 1, 'Only one query run');
 
-$tree_like = $schema->resultset('TreeLike')->search({'me.id' => 1});
+$tree_like = $schema->resultset('TreeLike')->search({'me.id' => 2});
 $tree_like = $tree_like->search_related('children')->search_related('children')->search_related('children')->first;
 is($tree_like->name, 'quux', 'Tree search_related ok');
 
 $tree_like = $schema->resultset('TreeLike')->search_related('children',
-    { 'children.id' => 2, 'children_2.id' => 3 },
+    { 'children.id' => 3, 'children_2.id' => 4 },
     { prefetch => { children => 'children' } }
   )->first;
 is(eval { $tree_like->children->first->children->first->name }, 'quux',
    'Tree search_related with prefetch ok');
 
 $tree_like = eval { $schema->resultset('TreeLike')->search(
-    { 'children.id' => 2, 'children_2.id' => 5 }, 
+    { 'children.id' => 3, 'children_2.id' => 6 }, 
     { join => [qw/children children/] }
-  )->search_related('children', { 'children_4.id' => 6 }, { prefetch => 'children' }
+  )->search_related('children', { 'children_4.id' => 7 }, { prefetch => 'children' }
   )->first->children->first; };
 is(eval { $tree_like->name }, 'fong', 'Tree with multiple has_many joins ok');
 
@@ -344,10 +344,10 @@ is($art_rs_pr->search_related('cds')->search_related('tracks')->first->title,
 
 is($queries, 0, 'chained search_related after has_many->has_many prefetch ran no queries');
 
-# 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)
+# once the following TODO is complete, remove the 2 warning tests immediately after the TODO block
+# (the TODO block itself contains tests ensuring that the warns are removed)
 TODO: {
-    local $TODO = 'Prefetch of multiple has_many rels at the same level (currently must die to protect the clueless git)';
+    local $TODO = 'Prefetch of multiple has_many rels at the same level (currently warn to protect the clueless git)';
     use DBIx::Class::ResultClass::HashRefInflator;
 
     #( 1 -> M + M )
@@ -364,26 +364,24 @@ TODO: {
     $queries = 0;
     $schema->storage->debugcb(sub { $queries++ });
     $schema->storage->debug(1);
-    eval {
+
+    my $o_mm_warn;
+    {
+        local $SIG{__WARN__} = sub { $o_mm_warn = shift };
         $pr_tracks_rs = $pr_cd_rs->first->tracks;
-        $pr_tracks_count = $pr_tracks_rs->count;
     };
+    $pr_tracks_count = $pr_tracks_rs->count;
 
-    my $o_mm_exc = $@;
-    ok(! $o_mm_exc, 'exception on attempt to prefetch several same level has_many\'s (1 -> M + M)');
+    ok(! $o_mm_warn, 'no warning on attempt to prefetch several same level has_many\'s (1 -> M + M)');
 
-    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($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)');
 
-        for ($pr_tracks_rs, $tracks_rs) {
-            $_->result_class ('DBIx::Class::ResultClass::HashRefInflator');
-        }
+    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)');
-    };
+    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!' });
@@ -401,30 +399,36 @@ TODO: {
     $queries = 0;
     $schema->storage->debugcb(sub { $queries++ });
     $schema->storage->debug(1);
-    eval {
+
+    my $m_o_mm_warn;
+    {
+        local $SIG{__WARN__} = sub { $m_o_mm_warn = shift };
         $pr_tags_rs = $pr_note_rs->first->cd->tags;
-        $pr_tags_count = $pr_tags_rs->count;
     };
+    $pr_tags_count = $pr_tags_rs->count;
 
-    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)');
+    ok(! $m_o_mm_warn, 'no warning on attempt to prefetch several same level has_many\'s (M -> 1 -> M + M)');
 
-    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($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)');
+    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');
-        }
+    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)');
-    };
+    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 };
-ok ($@, 'exception on attempt to prefetch several same level has_many\'s (1 -> M + M)');
-eval { my $tag = $schema->resultset('LinerNotes')->search ({ notes => 'Buy Whiskey!' }, { prefetch => { cd => [qw/tags tracks/] } })->first->cd->tags->first };
-ok ($@, 'exception on attempt to prefetch several same level has_many\'s (M -> 1 -> M + M)');
+# remove this closure once the TODO above is working
+my $w;
+{
+    local $SIG{__WARN__} = sub { $w = shift };
+
+    my $track = $schema->resultset('CD')->search ({ 'me.title' => 'Forkful of bees' }, { prefetch => [qw/tracks tags/] })->first->tracks->first;
+    like ($w, qr/will currently disrupt both the functionality of .rs->count\(\), and the amount of objects retrievable via .rs->next\(\)/,
+        'warning on attempt to prefetch several same level has_many\'s (1 -> M + M)');
+    my $tag = $schema->resultset('LinerNotes')->search ({ notes => 'Buy Whiskey!' }, { prefetch => { cd => [qw/tags tracks/] } })->first->cd->tags->first;
+    like ($w, qr/will currently disrupt both the functionality of .rs->count\(\), and the amount of objects retrievable via .rs->next\(\)/,
+        'warning on attempt to prefetch several same level has_many\'s (M -> 1 -> M + M)');
+}