Skip to content

fix(database): support multiple model properties joining the same table #2080

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

Open
laylatichy wants to merge 14 commits into
base: 3.x
Choose a base branch
from
Open

fix(database): support multiple model properties joining the same table #2080

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
478f7ec
fix(database): use property name as table alias for eager relations
laylatichy Mar 27, 2026
ef831da
test(database): add unit tests for same-table BelongsTo aliasing
laylatichy Mar 27, 2026
985f551
test(database): add integration tests for same-table relation data lo…
laylatichy Mar 27, 2026
45c1980
docs(database): update HasOneThrough SQL example to show aliased join
laylatichy Mar 27, 2026
7f0c9da
fix(database): apply rewriteTablePrefix consistently across all relat…
laylatichy Mar 27, 2026
238f3d0
fix(database): quote table aliases in JOINs for PostgreSQL compatibility
laylatichy Mar 27, 2026
24a04bc
test(database): add same-table relation tests for HasOne, HasMany, Be…
laylatichy Mar 27, 2026
cde1de2
refactor(database): replace rewriteTablePrefix with replaceTableRefer…
laylatichy Mar 27, 2026
2b6714f
style(database): revert sprintf to original style to minimize diff noise
laylatichy Mar 27, 2026
6abbbd9
test(database): consolidate same-table relation tests with real data
laylatichy Mar 27, 2026
d555e2b
fix(database): use dialect-correct quoting for PostgreSQL identifiers
laylatichy Mar 27, 2026
26dab63
refactor(database): only alias when duplicate target tables detected
laylatichy Mar 27, 2026
d6ac901
test(database): add unit tests for shouldUsePropertyNameAlias detection
laylatichy Mar 27, 2026
ff5fde7
fix(database): quote aliased identifiers for PostgreSQL compatibility
laylatichy Mar 31, 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
17 changes: 13 additions & 4 deletions packages/database/src/BelongsTo.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,11 @@ private function getRelationJoin(ModelInspector $relationModel, string $tableAli
}

if ($relationJoin) {
return $relationJoin;
return $this->replaceTableReference(
qualifiedColumn: $relationJoin,
originalTable: $relationModel->getTableName(),
aliasedTable: $tableAlias,
);
}

$primaryKey = $relationModel->getPrimaryKey();
Expand Down Expand Up @@ -167,18 +171,23 @@ private function isSelfReferencing(): bool
private function getOwnerJoin(ModelInspector $ownerModel): string
{
$ownerJoin = $this->ownerJoin;
$ownerTable = $ownerModel->getTableName();

if ($ownerJoin && ! strpos($ownerJoin, '.')) {
$ownerJoin = sprintf('%s.%s', $ownerModel->getTableName(), $ownerJoin);
$ownerJoin = sprintf('%s.%s', $ownerTable, $ownerJoin);
}

if ($ownerJoin) {
return $ownerJoin;
return $this->replaceTableReference(
qualifiedColumn: $ownerJoin,
originalTable: $ownerModel->getTableName(),
aliasedTable: $ownerTable,
);
}

return sprintf(
'%s.%s',
$ownerModel->getTableName(),
$ownerTable,
$this->getOwnerFieldName(),
);
}
Expand Down
11 changes: 8 additions & 3 deletions packages/database/src/BelongsToMany.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,7 @@ private function resolveOwnerJoin(
private function resolveRelationJoin(ModelInspector $ownerModel): string
{
$relationJoin = $this->relationJoin;
$ownerTable = $ownerModel->getTableName();

if (
$relationJoin
Expand All @@ -257,13 +258,17 @@ private function resolveRelationJoin(ModelInspector $ownerModel): string
) {
return sprintf(
'%s.%s',
$ownerModel->getTableName(),
$ownerTable,
$relationJoin,
);
}

if ($relationJoin) {
return $relationJoin;
return $this->replaceTableReference(
qualifiedColumn: $relationJoin,
originalTable: $ownerModel->getTableName(),
aliasedTable: $ownerTable,
);
}

$primaryKey = $ownerModel->getPrimaryKey();
Expand All @@ -277,7 +282,7 @@ private function resolveRelationJoin(ModelInspector $ownerModel): string

return sprintf(
'%s.%s',
$ownerModel->getTableName(),
$ownerTable,
$primaryKey,
);
}
Expand Down
21 changes: 21 additions & 0 deletions packages/database/src/Builder/QueryBuilders/SelectQueryBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,6 +500,27 @@ public function getResolvedRelations(): array
$relations = [...$relations, ...$resolvedRelations];
}

return $this->shouldUsePropertyNameAlias($relations);
}

/**
* @param Relation[] $relations
*
* @return Relation[]
*/
private function shouldUsePropertyNameAlias(array $relations): array
{
$rootTables = arr(input: $relations)
->filter(filter: fn (Relation $_, string $path) => ! str_contains(haystack: $path, needle: '.'))
->map(map: fn (Relation $relation) => inspect(model: $relation)->getTableName())
->toArray();

$counts = array_count_values(array: $rootTables);

arr(input: $rootTables)
->filter(filter: fn (string $table) => $counts[$table] > 1)
->each(each: fn (string $_, string $path) => $relations[$path]->withPropertyNameAlias());

return $relations;
}

Expand Down
19 changes: 15 additions & 4 deletions packages/database/src/HasMany.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,13 @@ private function getOwnerJoin(ModelInspector $ownerModel, ModelInspector $relati
}

if ($ownerJoin) {
return $ownerJoin;
$ownerModel = inspect($this->property->getIterableType()->asClass());

return $this->replaceTableReference(
qualifiedColumn: $ownerJoin,
originalTable: $ownerModel->getTableName(),
aliasedTable: $tableReference,
);
}

$primaryKey = $relationModel->getPrimaryKey();
Expand Down Expand Up @@ -183,17 +189,22 @@ private function isSelfReferencing(): bool
private function getRelationJoin(ModelInspector $relationModel): string
{
$relationJoin = $this->relationJoin;
$ownerTable = $relationModel->getTableName();

if ($relationJoin && ! strpos($relationJoin, '.')) {
$relationJoin = sprintf(
'%s.%s',
$relationModel->getTableName(),
$ownerTable,
$relationJoin,
);
}

if ($relationJoin) {
return $relationJoin;
return $this->replaceTableReference(
qualifiedColumn: $relationJoin,
originalTable: $relationModel->getTableName(),
aliasedTable: $ownerTable,
);
}

$primaryKey = $relationModel->getPrimaryKey();
Expand All @@ -204,7 +215,7 @@ private function getRelationJoin(ModelInspector $relationModel): string

return sprintf(
'%s.%s',
$relationModel->getTableName(),
$ownerTable,
$primaryKey,
);
}
Expand Down
11 changes: 8 additions & 3 deletions packages/database/src/HasManyThrough.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,7 @@ private function resolveOwnerJoin(
private function resolveRelationJoin(ModelInspector $ownerModel): string
{
$relationJoin = $this->relationJoin;
$ownerTable = $ownerModel->getTableName();

if (
$relationJoin
Expand All @@ -226,13 +227,17 @@ private function resolveRelationJoin(ModelInspector $ownerModel): string
) {
return sprintf(
'%s.%s',
$ownerModel->getTableName(),
$ownerTable,
$relationJoin,
);
}

if ($relationJoin) {
return $relationJoin;
return $this->replaceTableReference(
qualifiedColumn: $relationJoin,
originalTable: $ownerModel->getTableName(),
aliasedTable: $ownerTable,
);
}

$primaryKey = $ownerModel->getPrimaryKey();
Expand All @@ -246,7 +251,7 @@ private function resolveRelationJoin(ModelInspector $ownerModel): string

return sprintf(
'%s.%s',
$ownerModel->getTableName(),
$ownerTable,
$primaryKey,
);
}
Expand Down
17 changes: 13 additions & 4 deletions packages/database/src/HasOne.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,11 @@ private function getOwnerJoin(ModelInspector $ownerModel, ModelInspector $relati
}

if ($ownerJoin) {
return $ownerJoin;
return $this->replaceTableReference(
qualifiedColumn: $ownerJoin,
originalTable: inspect($this->property->getType()->asClass())->getTableName(),
aliasedTable: $tableReference,
);
}

$primaryKey = $relationModel->getPrimaryKey();
Expand Down Expand Up @@ -155,17 +159,22 @@ private function isSelfReferencing(): bool
private function getRelationJoin(ModelInspector $relationModel): string
{
$relationJoin = $this->relationJoin;
$ownerTable = $relationModel->getTableName();

if ($relationJoin && ! strpos($relationJoin, '.')) {
$relationJoin = sprintf(
'%s.%s',
$relationModel->getTableName(),
$ownerTable,
$relationJoin,
);
}

if ($relationJoin) {
return $relationJoin;
return $this->replaceTableReference(
qualifiedColumn: $relationJoin,
originalTable: $relationModel->getTableName(),
aliasedTable: $ownerTable,
);
}

$primaryKey = $relationModel->getPrimaryKey();
Expand All @@ -176,7 +185,7 @@ private function getRelationJoin(ModelInspector $relationModel): string

return sprintf(
'%s.%s',
$relationModel->getTableName(),
$ownerTable,
$primaryKey,
);
}
Expand Down
11 changes: 8 additions & 3 deletions packages/database/src/HasOneThrough.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,7 @@ private function resolveOwnerJoin(
private function resolveRelationJoin(ModelInspector $ownerModel): string
{
$relationJoin = $this->relationJoin;
$ownerTable = $ownerModel->getTableName();

if (
$relationJoin
Expand All @@ -183,13 +184,17 @@ private function resolveRelationJoin(ModelInspector $ownerModel): string
) {
return sprintf(
'%s.%s',
$ownerModel->getTableName(),
$ownerTable,
$relationJoin,
);
}

if ($relationJoin) {
return $relationJoin;
return $this->replaceTableReference(
qualifiedColumn: $relationJoin,
originalTable: $ownerModel->getTableName(),
aliasedTable: $ownerTable,
);
}

$primaryKey = $ownerModel->getPrimaryKey();
Expand All @@ -203,7 +208,7 @@ private function resolveRelationJoin(ModelInspector $ownerModel): string

return sprintf(
'%s.%s',
$ownerModel->getTableName(),
$ownerTable,
$primaryKey,
);
}
Expand Down
32 changes: 31 additions & 1 deletion packages/database/src/HasTableAlias.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,27 @@

trait HasTableAlias
{
public bool $withPropertyNameAlias = false;

public function withPropertyNameAlias(): self
{
$this->withPropertyNameAlias = true;

return $this;
}

private function getTableAlias(string $tableName): string
{
if ($this->parent === null || $this->parent === '') {
if ($this->parent === null) {
return $tableName;
}

if ($this->parent === '') {
return $this->withPropertyNameAlias
? str(string: $this->property->getName())->wrap('`')->toString()
: $tableName;
}

return str(string: $this->parent)
->replace(
search: '.',
Expand All @@ -23,6 +38,21 @@ private function getTableAlias(string $tableName): string
'_',
$this->property->getName(),
)
->wrap('`')
->toString();
}

private function replaceTableReference(string $qualifiedColumn, string $originalTable, string $aliasedTable): string
{
if ($aliasedTable === $originalTable) {
return $qualifiedColumn;
}

return str(string: $qualifiedColumn)
->replaceFirst(
search: "{$originalTable}.",
replace: "{$aliasedTable}.",
)
->toString();
}
}
8 changes: 6 additions & 2 deletions packages/database/src/QueryStatements/JoinStatement.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,13 @@ public function compile(DatabaseDialect $dialect): string
$statement = $this->statement;

if (! str($statement)->lower()->startsWith(['join', 'inner join', 'left join', 'right join', 'full join', 'full outer join', 'self join'])) {
return sprintf('INNER JOIN %s', $statement);
$statement = sprintf('INNER JOIN %s', $statement);
}

return $statement;
return match ($dialect) {
DatabaseDialect::POSTGRESQL => str_replace('`', '"', $statement),
DatabaseDialect::SQLITE => str_replace('`', '', $statement),
default => $statement,
};
}
}
4 changes: 4 additions & 0 deletions packages/database/src/Relation.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,12 @@ interface Relation extends PropertyAttribute
{
public string $name { get; }

public bool $withPropertyNameAlias { get; }

public function setParent(string $name): self;

public function withPropertyNameAlias(): self;

public function getSelectFields(): ImmutableArray;

public function getJoinStatement(): JoinStatement;
Expand Down
Loading
Loading