Merge 'trunk' into 'replication_dedux'

[dbsrgits/DBIx-Class.git] / t / 90join_torture.t

diff --git a/t/90join_torture.t b/t/90join_torture.t
index 12d2cdf..a277475 100644 (file)
--- a/t/90join_torture.t
+++ b/t/90join_torture.t
@@ -6,7 +6,7 @@ use lib qw(t/lib);
 use DBICTest;
 my $schema = DBICTest->init_schema();
 
-plan tests => 20;
+plan tests => 22;
 
  {
    my $rs = $schema->resultset( 'CD' )->search(
@@ -119,4 +119,10 @@ eval {
 
 ok(!$@, "pathological prefetch ok");
 
+my $rs = $schema->resultset("Artist")->search({}, { join => 'twokeys' });
+my $second_search_rs = $rs->search({ 'cds_2.cdid' => '2' }, { join =>
+['cds', 'cds'] });
+is(scalar(@{$second_search_rs->{attrs}->{join}}), 3, 'both joins kept');
+ok($second_search_rs->next, 'query on double joined rel runs okay');
+
 1;