Skip to content
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.

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

[5.8] Fix self-referencing MorphOneOrMany existence queries #29765

Merged
merged 1 commit into from
Aug 27, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ protected function setForeignAttributesForCreate(Model $model)
public function getRelationExistenceQuery(Builder $query, Builder $parentQuery, $columns = ['*'])
{
return parent::getRelationExistenceQuery($query, $parentQuery, $columns)->where(
$this->morphType, $this->morphClass
$query->qualifyColumn($this->getMorphType()), $this->morphClass
);
}

Expand Down
18 changes: 18 additions & 0 deletions tests/Integration/Database/EloquentMorphManyTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,19 @@ public function test_update_model_with_default_withCount()

$this->assertEquals('new name', $post->title);
}

public function test_self_referencing_existence_query()
{
$post = Post::create(['title' => 'foo']);

$comment = tap((new Comment(['name' => 'foo']))->commentable()->associate($post))->save();

(new Comment(['name' => 'bar']))->commentable()->associate($comment)->save();

$comments = Comment::has('replies')->get();

$this->assertEquals([1], $comments->pluck('id')->all());
}
}

class Post extends Model
Expand All @@ -68,4 +81,9 @@ public function commentable()
{
return $this->morphTo();
}

public function replies()
{
return $this->morphMany(self::class, 'commentable');
}
}