[9.x] Add wherehas soft deleting scopes#42100
Merged
taylorotwell merged 7 commits intolaravel:9.xfrom May 3, 2022
Merged
Conversation
Improves relationship constraint merging to consider table aliases.
| self::assertCount(0, $versionsT); | ||
|
|
||
| self::assertEquals(1, SoftDeletesTestUser::whereHas('versions')->count()); | ||
| } |
Contributor
There was a problem hiding this comment.
Would match the code style of the rest of the tests (by using $this over self:: and inline your variables $versionsA and $versionsT. More like this:
public function testSelfReferencingRelationshipWithSoftDeletes()
{
[$taylor, $abigail] = $this->createUsers();
$this->assertCount(1, $abigail->versions);
$this->assertTrue($abigail->versions->first()->is($taylor));
$this->assertCount(0, $taylor->versions);
$this->assertEquals(1, SoftDeletesTestUser::whereHas('versions')->count());
}There also may be a better name than version for this "test" relationship. Maybe self_referencing() to make the test relation match the test case, making it more clear?
public function testSelfReferencingRelationshipWithSoftDeletes()
{
[$taylor, $abigail] = $this->createUsers();
$this->assertCount(1, $abigail->self_referencing);
$this->assertTrue($abigail->self_referencing->first()->is($taylor));
$this->assertCount(0, $taylor->self_referencing);
$this->assertEquals(1, SoftDeletesTestUser::whereHas('self_referencing')->count());
}
public function self_referencing()
{
return $this->hasMany(SoftDeletesTestUser::class, 'user_id')->onlyTrashed();
}
Contributor
Author
|
Agree and done :) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
An attempt to fix/Improve mergeConstraintsFrom to use correct qualified column names.
Related issue --> #42075