X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F76joins.t;h=dff7046ac11859724a0a3a720b821064ee17e572;hb=2359353990ae5b1961bb9585cfa915cf0cee5642;hp=1e39dfb2f26966d9c98a3c46f4c7998f7d4fac2c;hpb=48d2be642ebad6854308b2938811ebcb84aafdd8;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/76joins.t b/t/76joins.t
index 1e39dfb..dff7046 100644
--- a/t/76joins.t
+++ b/t/76joins.t
@@ -308,14 +308,15 @@ $tree_like = $schema->resultset('TreeLike')->search_related('children',
     { 'children.id' => 2, 'children_2.id' => 3 },
     { prefetch => { children => 'children' } }
   )->first;
-is($tree_like->children->first->children->first->name, 'quux', 'Tree search_related with prefetch ok');
+is(eval { $tree_like->children->first->children->first->name }, 'quux',
+   'Tree search_related with prefetch ok');
 
-$tree_like = $schema->resultset('TreeLike')->search(
+$tree_like = eval { $schema->resultset('TreeLike')->search(
     { 'children.id' => 2, 'children_2.id' => 5 }, 
     { join => [qw/children children/] }
-  )->search_related('children', { 'children_3.id' => 6 }, { prefetch => 'children' }
-  )->first->children->first;
-is($tree_like->name, 'fong', 'Tree with multiple has_many joins ok');
+  )->search_related('children', { 'children_4.id' => 6 }, { prefetch => 'children' }
+  )->first->children->first; };
+is(eval { $tree_like->name }, 'fong', 'Tree with multiple has_many joins ok');
 
 # test that collapsed joins don't get a _2 appended to the alias
 
@@ -330,7 +331,7 @@ eval {
   })->search_related('tracks')->first;
 };
 
-like( $sql, qr/^SELECT tracks\.trackid/, "collapsed join didn't add _2 to alias" );
+like( $sql, qr/^SELECT tracks_2\.trackid/, "join not collapsed for search_related" );
 
 $schema->storage->debug($orig_debug);
 $schema->storage->debugobj->callback(undef);