Skip to content

[9.x] Fix base query for relationships #41918

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
Apr 11, 2022
Merged

[9.x] Fix base query for relationships #41918

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
aa169cf
Fix base query for relationships
driesvints Apr 11, 2022
1cbcaa7
Add test
driesvints Apr 11, 2022
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/Relation.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ public function getBaseQuery()
*/
public function toBase()
{
return $this->query->getQuery();
return $this->query->applyScopes()->getQuery();
}

/**
Expand Down
19 changes: 18 additions & 1 deletion tests/Database/DatabaseEloquentSoftDeletesIntegrationTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,19 @@ public function testSoftDeletesAreNotRetrievedFromBaseQuery()
$this->assertCount(1, $query->get());
}

public function testSoftDeletesAreNotRetrievedFromRelationshipBaseQuery()
{
[, $abigail] = $this->createUsers();

$abigail->posts()->create(['title' => 'Foo']);
$abigail->posts()->create(['title' => 'Bar'])->delete();

$query = $abigail->posts()->toBase();

$this->assertInstanceOf(Builder::class, $query);
$this->assertCount(1, $query->get());
}

public function testSoftDeletesAreNotRetrievedFromBuilderHelpers()
{
$this->createUsers();
Expand Down Expand Up @@ -867,13 +880,17 @@ public function testMorphToNonSoftDeletingModel()

/**
* Helpers...
*
* @return \Illuminate\Tests\Database\SoftDeletesTestUser[]
*/
protected function createUsers()
{
$taylor = SoftDeletesTestUser::create(['id' => 1, 'email' => '[email protected]']);
SoftDeletesTestUser::create(['id' => 2, 'email' => '[email protected]']);
$abigail = SoftDeletesTestUser::create(['id' => 2, 'email' => '[email protected]']);

$taylor->delete();

return [$taylor, $abigail];
}

/**
Expand Down