X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F76joins.t;h=d09650d1411f313661018149b224594a90620ec3;hb=8de797db7b1f4ce73c0c9512376117c3bfa48a4d;hp=600159875ebd07565ebf86a5909f84ed009fa332;hpb=af4cd3e568e12a5060078abbae021c8259e5512d;p=dbsrgits%2FDBIx-Class-Historic.git

diff --git a/t/76joins.t b/t/76joins.t
index 6001598..d09650d 100644
--- a/t/76joins.t
+++ b/t/76joins.t
@@ -13,7 +13,7 @@ BEGIN {
     eval "use DBD::SQLite";
     plan $@
         ? ( skip_all => 'needs DBD::SQLite for testing' )
-        : ( tests => 44 );
+        : ( tests => 47 );
 }
 
 # figure out if we've got a version of sqlite that is older than 3.2.6, in
@@ -295,6 +295,32 @@ $schema->storage->debug(0);
 
 cmp_ok($queries, '==', 1, 'Only one query run');
 
-$tree_like = $schema->resultset('TreeLike')->find(1);
+$tree_like = $schema->resultset('TreeLike')->search({'me.id' => 1});
 $tree_like = $tree_like->search_related('children')->search_related('children')->search_related('children')->first;
-is($tree_like->name, 'quux', 'Tree search_related ok');
\ No newline at end of file
+is($tree_like->name, 'quux', 'Tree search_related ok');
+
+$tree_like = $schema->resultset('TreeLike')->search({ 'children.id' => 2 });
+$tree_like = $tree_like->search_related('children', undef, { prefetch => { children => 'children' } })->first;
+is($tree_like->children->first->children->first->name, 'quux', 'Tree search_related with prefetch ok');
+
+$tree_like = $schema->resultset('TreeLike')->search(
+    { 'children.id' => 2, 'children_2.id' => 5 }, 
+    { join => [qw/children children/] })->first;
+is($tree_like->name, 'foo', 'Tree with multiple has_many joins ok');
+
+# test that collapsed joins don't get a _2 appended to the alias
+
+my $sql = '';
+$schema->storage->debugcb(sub { $sql = $_[1] });
+$schema->storage->debug(1);
+
+eval {
+  my $row = $schema->resultset('Artist')->search_related('cds', undef, {
+    join => 'tracks',
+    prefetch => 'tracks',
+  })->search_related('tracks')->first;
+};
+
+like( $sql, qr/^SELECT tracks.trackid/, "collapsed join didn't add _2 to alias" );
+
+$schema->storage->debug(0);