Skip to content

Fix : Type Mismatch in Polymorphic Relationships When Using PostgreSQL #54401 #58603

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
bazan101 wants to merge 7 commits into
base: 12.x
Choose a base branch
from
+32 −11
Draft

Fix : Type Mismatch in Polymorphic Relationships When Using PostgreSQL #54401 #58603

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7e41497
fix postgres morh type mismatch
Feb 3, 2026
2cb95c3
Fix Polymorphic Type Mismatch in PostgreSQL and update tests
Feb 3, 2026
c94c048
feat: Applique les contraintes parentes lors du chargement anticipé d…
Feb 4, 2026
56a5a2c
fix: Ajuste la paramétrisation SQL dans un test HasOneOfMany, corrige…
Feb 4, 2026
c110fc9
fix typo
Feb 4, 2026
a0d440b
fix hard coded value
Feb 4, 2026
3638da0
fix hard coded value
Feb 4, 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
11 changes: 11 additions & 0 deletions src/Illuminate/Database/Eloquent/Relations/MorphOneOrMany.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,11 @@ public function addConstraints()
if (static::$constraints) {
$this->getRelationQuery()->where($this->morphType, $this->morphClass);

$this->getRelationQuery()->where(
$this->foreignKey, '=', (string) $this->getParentKey()
);

$this->getRelationQuery()->whereNotNull($this->foreignKey);
Comment on lines 58 to +64
Copy link
Contributor

@shaedrich shaedrich Feb 4, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can't you just do this?

Suggested change
$this->getRelationQuery()->where($this->morphType, $this->morphClass);
parent::addConstraints();
$this->getRelationQuery()->where(
$this->foreignKey, '=', (string) $this->getParentKey()
);
$this->getRelationQuery()->whereNotNull($this->foreignKey);
$this->getRelationQuery()
->where($this->morphType, $this->morphClass)
->where($this->foreignKey, '=', (string) $this->getParentKey())
->whereNotNull($this->foreignKey);

Copy link
Author

@bazan101 bazan101 Feb 4, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah it is a better implementation but don't we want to to keep the parent::addConstraints(); line at the begining ?

Copy link
Contributor

@shaedrich shaedrich Feb 4, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we don't and we don't keep it

parent::addConstraints();
}
}
Expand All @@ -65,6 +70,12 @@ public function addConstraints()
public function addEagerConstraints(array $models)
{
parent::addEagerConstraints($models);
$this->whereInEager(
'whereIn',
$this->foreignKey,
array_map(fn ($value) => (string) $value, $this->getKeys($models, $this->localKey)),
$this->getRelationQuery()
);

$this->getRelationQuery()->where($this->morphType, $this->morphClass);
}
Expand Down
1 change: 1 addition & 0 deletions tests/Database/DatabaseEloquentMorphOneOfManyTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ public function testEagerLoadingAppliesConstraintsToInnerJoinSubQuery()
$relation = $product->current_state();
$relation->addEagerConstraints([$product]);
$this->assertSame('select MAX("states"."id") as "id_aggregate", "states"."stateful_id", "states"."stateful_type" from "states" where "states"."stateful_type" = ? and "states"."stateful_id" = ? and "states"."stateful_id" is not null and "states"."stateful_id" in (1) and "states"."stateful_type" = ? group by "states"."stateful_id", "states"."stateful_type"', $relation->getOneOfManySubQuery()->toSql());

}

public function testReceivingModel()
Expand Down
22 changes: 16 additions & 6 deletions tests/Database/DatabaseEloquentMorphTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,21 +26,25 @@ protected function tearDown(): void
public function testMorphOneSetsProperConstraints()
{
$this->getOneRelation();

$this->assertTrue(true);
}

public function testMorphOneEagerConstraintsAreProperlyAdded()
{
$relation = $this->getOneRelation();
$relation->getParent()->shouldReceive('getKeyName')->once()->andReturn('id');
$relation->getParent()->shouldReceive('getKeyType')->once()->andReturn('string');
$relation->getQuery()->shouldReceive('whereIn')->once()->with('table.morph_id', [1, 2]);
$relation->getQuery()->shouldReceive('whereIn')->once()->with('table.morph_id', ['1', '2']);
$relation->getQuery()->shouldReceive('where')->once()->with('table.morph_type', get_class($relation->getParent()));

$model1 = new EloquentMorphResetModelStub;
$model1->id = 1;
$model2 = new EloquentMorphResetModelStub;
$model2->id = 2;
$relation->addEagerConstraints([$model1, $model2]);

$this->assertTrue(true);
}

/**
Expand All @@ -50,21 +54,25 @@ public function testMorphOneEagerConstraintsAreProperlyAdded()
public function testMorphManySetsProperConstraints()
{
$this->getManyRelation();

$this->assertTrue(true);
}

public function testMorphManyEagerConstraintsAreProperlyAdded()
{
$relation = $this->getManyRelation();
$relation->getParent()->shouldReceive('getKeyName')->once()->andReturn('id');
$relation->getParent()->shouldReceive('getKeyName')->once()->andReturn('id');
$relation->getParent()->shouldReceive('getKeyType')->once()->andReturn('int');
$relation->getQuery()->shouldReceive('whereIntegerInRaw')->once()->with('table.morph_id', [1, 2]);
$relation->getQuery()->shouldReceive('whereIn')->once()->with('table.morph_id', ['1', '2']);
$relation->getQuery()->shouldReceive('where')->once()->with('table.morph_type', get_class($relation->getParent()));

$model1 = new EloquentMorphResetModelStub;
$model1->id = 1;
$model2 = new EloquentMorphResetModelStub;
$model2->id = 2;
$relation->addEagerConstraints([$model1, $model2]);

$this->assertTrue(true);
}

public function testMorphRelationUpsertFillsForeignKey()
Expand Down Expand Up @@ -102,6 +110,8 @@ public function testMorphRelationUpsertFillsForeignKey()
['email'],
['name']
);

$this->assertTrue(true);
}

public function testMakeFunctionOnMorph()
Expand Down Expand Up @@ -484,7 +494,7 @@ protected function getOneRelation()
$queryBuilder = m::mock(QueryBuilder::class);
$builder = m::mock(Builder::class, [$queryBuilder]);
$builder->shouldReceive('whereNotNull')->once()->with('table.morph_id');
$builder->shouldReceive('where')->once()->with('table.morph_id', '=', 1);
$builder->shouldReceive('where')->once()->with('table.morph_id', '=', '1');
$related = m::mock(Model::class);
$builder->shouldReceive('getModel')->andReturn($related);
$parent = m::mock(Model::class);
Expand All @@ -499,7 +509,7 @@ protected function getManyRelation()
{
$builder = m::mock(Builder::class);
$builder->shouldReceive('whereNotNull')->once()->with('table.morph_id');
$builder->shouldReceive('where')->once()->with('table.morph_id', '=', 1);
$builder->shouldReceive('where')->once()->with('table.morph_id', '=', '1');
$related = m::mock(Model::class);
$builder->shouldReceive('getModel')->andReturn($related);
$parent = m::mock(Model::class);
Expand All @@ -520,7 +530,7 @@ protected function getNamespacedRelation($alias)

$builder = m::mock(Builder::class);
$builder->shouldReceive('whereNotNull')->once()->with('table.morph_id');
$builder->shouldReceive('where')->once()->with('table.morph_id', '=', 1);
$builder->shouldReceive('where')->once()->with('table.morph_id', '=', '1');
$related = m::mock(Model::class);
$builder->shouldReceive('getModel')->andReturn($related);
$parent = m::mock(EloquentModelNamespacedStub::class);
Expand Down
Loading