Skip to content

[5.5] Fix eager loading HasManyThrough relations with custom intermediate and local key #21902

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 1, 2017
Merged

[5.5] Fix eager loading HasManyThrough relations with custom intermediate and local key #21902

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1acbfa3
Add failing test for eager loading with custom intermediate and local…
Oct 31, 2017
505dbf8
Add eager loading fix for hasManyThrough relations
Nov 1, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Illuminate/Database/Eloquent/Relations/HasManyThrough.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ public function match(array $models, Collection $results, $relation)
// link them up with their children using the keyed dictionary to make the
// matching very convenient and easy work. Then we'll just return them.
foreach ($models as $model) {
if (isset($dictionary[$key = $model->getKey()])) {
if (isset($dictionary[$key = $model->getAttribute($this->localKey)])) {
$model->setRelation(
$relation, $this->related->newCollection($dictionary[$key])
);
Expand Down
9 changes: 9 additions & 0 deletions tests/Database/DatabaseEloquentHasManyThroughIntegrationTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,15 @@ public function testItLoadsARelationWithCustomIntermediateAndLocalKey()
$this->assertCount(2, $posts);
}

public function testEagerLoadingARelationWithCustomIntermediateAndLocalKey()
{
$this->seedData();
$posts = HasManyThroughIntermediateTestCountry::with('posts')->first()->posts;

$this->assertEquals('A title', $posts[0]->title);
$this->assertCount(2, $posts);
}

/**
* @expectedException \Illuminate\Database\Eloquent\ModelNotFoundException
* @expectedExceptionMessage No query results for model [Illuminate\Tests\Database\HasManyThroughTestPost].
Expand Down