Skip to content

[13.x] Generate plural morph pivot table name #56832

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
taylorotwell merged 2 commits into from
Sep 4, 2025
Merged

[13.x] Generate plural morph pivot table name #56832

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
4e6a334
Update test to use 'MorphPivot' model for pivot
willrowe Aug 29, 2025
b34304e
Only generate a singular table name for non-morph pivots
willrowe Aug 29, 2025
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
5 changes: 3 additions & 2 deletions src/Illuminate/Database/Eloquent/Relations/Concerns/AsPivot.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
namespace Illuminate\Database\Eloquent\Relations\Concerns;

use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\MorphPivot;
use Illuminate\Support\Str;

trait AsPivot
Expand Down Expand Up @@ -166,13 +167,13 @@ protected function getDeleteQuery()
*/
public function getTable()
{
if (! isset($this->table)) {
if (! isset($this->table) && (! $this instanceof MorphPivot)) {
$this->setTable(str_replace(
'\\', '', Str::snake(Str::singular(class_basename($this)))
));
}

return $this->table;
return parent::getTable();
}

/**
Expand Down
6 changes: 5 additions & 1 deletion tests/Database/DatabaseEloquentIntegrationTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2834,10 +2834,14 @@ public function parentPost()

public function tags()
{
return $this->morphToMany(EloquentTestTag::class, 'taggable', null, null, 'tag_id')->withPivot('taxonomy');
return $this->morphToMany(EloquentTestTag::class, 'taggable', Taggable::class, null, 'tag_id')->withPivot('taxonomy');
}
}

class Taggable extends MorphPivot
{
}

class EloquentTestTag extends Eloquent
{
protected $table = 'tags';
Expand Down
Loading