Skip to content

Fix/eager load one of many subquery constraints #59337

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

Draft
sadique-cws wants to merge 4 commits into
base: 13.x
Choose a base branch
from
+40 −3
Draft

Fix/eager load one of many subquery constraints #59337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fcd90b9
[12.x] Apply eager load constraints to oneOfMany inner subquery
sadique-cws Mar 23, 2026
a3d63c8
Add integration test for eager load oneOfMany constraints
sadique-cws Mar 23, 2026
68f4676
[13.x] Fix eager loaded oneOfMany relationship constraints in closures
sadique-cws Mar 25, 2026
d4b49e0
[13.x] Fix oneOfMany relationship constraints via native routing
sadique-cws Mar 25, 2026
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
20 changes: 20 additions & 0 deletions src/Illuminate/Database/Eloquent/Relations/Concerns/CanBeOneOfMany.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,4 +329,24 @@ public function getRelationName()
{
return $this->relationName;
}

/**
* Handle dynamic method calls to the relationship.
*
* @param string $method
* @param array $parameters
* @return mixed
*/
public function __call($method, $parameters)
{
if (static::hasMacro($method)) {
return $this->macroCall($method, $parameters);
}

$query = $this->isOneOfMany() && (str_starts_with($method, 'where') || str_starts_with($method, 'orWhere'))
? $this->getOneOfManySubQuery()
: $this->query;

return $this->forwardDecoratedCallTo($query, $method, $parameters);
}
}
23 changes: 20 additions & 3 deletions tests/Database/DatabaseEloquentHasOneOfManyTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,8 @@ public function testItGetsWithConstraintsCorrectResults()
$user->logins()->create();

$result = $user->latest_login()->whereKey($previousLogin->getKey())->getResults();
$this->assertNull($result);
$this->assertNotNull($result);
$this->assertSame($previousLogin->id, $result->id);
}

public function testItEagerLoadsCorrectModels()
Expand Down Expand Up @@ -314,7 +315,7 @@ public function testExists()
$previousLogin = $user->logins()->create();
$latestLogin = $user->logins()->create();

$this->assertFalse($user->latest_login()->whereKey($previousLogin->getKey())->exists());
$this->assertTrue($user->latest_login()->whereKey($previousLogin->getKey())->exists());
$this->assertTrue($user->latest_login()->whereKey($latestLogin->getKey())->exists());
}

Expand Down Expand Up @@ -349,7 +350,8 @@ public function testGet()
$this->assertSame($latestLogin->id, $latestLogins->first()->id);

$latestLogins = $user->latest_login()->whereKey($previousLogin->getKey())->get();
$this->assertCount(0, $latestLogins);
$this->assertCount(1, $latestLogins);
$this->assertSame($previousLogin->id, $latestLogins->first()->id);
}

public function testCount()
Expand Down Expand Up @@ -437,6 +439,21 @@ public function testEagerLoadingWithMultipleAggregates()
$this->assertSame($user2Price->id, $users[1]->price->id);
}

public function testEagerLoadingWithConstraintsAppliesToSubQuery()
{
$user = HasOneOfManyTestUser::create();
$user->logins()->create(); // ID 1
$login2 = $user->logins()->create(); // ID 2
$user->logins()->create(); // ID 3

$users = HasOneOfManyTestUser::with(['latest_login' => function ($q) {
$q->where('logins.id', '<', 3);
}])->get();

$this->assertNotNull($users[0]->latest_login);
$this->assertSame($login2->id, $users[0]->latest_login->id);
}

public function testWithExists()
{
$user = HasOneOfManyTestUser::create();
Expand Down
Loading