esoko/soko-web
esoko/soko-web
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request 'use the correct table alias in joins 'on clause'' (#17) from bugfix/fix-multiple-level-join-table-alias into master
All checks were successful
soko-web/pipeline/head This commit looks good
Details

Browse Source 
Reviewed-on: #17
This commit is contained in:
Bence Pőcze 2023-05-02 18:06:33 +02:00
commit 585d469b69
Signed by: Gitea
GPG Key ID: 7B89B83EED9AD2C6
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/PersistentData/PersistentDataManager.php
View File

@ -150,7 +150,7 @@ class PersistentDataManager implements IPersistentDataManager
$columns = array_merge($columns, $this->getRelationColumns($table, $relations, $withRelations)); $columns = array_merge($columns, $this->getRelationColumns($table, $relations, $withRelations));
$this->leftJoinRelations($select, $table, $relations, $withRelations); $this->leftJoinRelations($select, $table, $table, $relations, $withRelations);
$select->columns($columns); $select->columns($columns);
} else { } else {
$select->columns($columns); $select->columns($columns);
@ -180,19 +180,19 @@ class PersistentDataManager implements IPersistentDataManager
return $columns; return $columns;
} }
private function leftJoinRelations(Select $select, string $table, array $relations, array $withRelations): void private function leftJoinRelations(Select $select, string $table, string $tableAlias, array $relations, array $withRelations): void
{ {
foreach ($relations as $relation => $relationType) { foreach ($relations as $relation => $relationType) {
$relationTableAlias = $table . '__' . $relation; $relationTableAlias = $table . '__' . $relation;
$relationTable = call_user_func([$relationType, 'getTable']); $relationTable = call_user_func([$relationType, 'getTable']);
$select->setTableAliases([$relationTableAlias => $relationTable]); $select->setTableAliases([$relationTableAlias => $relationTable]);
$select->leftJoin($relationTableAlias, [$relationTableAlias, 'id'], '=', [$table, $relation . '_id']); $select->leftJoin($relationTableAlias, [$relationTableAlias, 'id'], '=', [$tableAlias, $relation . '_id']);
$relationsOfRelation = call_user_func([$relationType, 'getRelations']); $relationsOfRelation = call_user_func([$relationType, 'getRelations']);
if (count($withRelations)) { if (count($withRelations)) {
$relationsOfRelation = array_intersect_key($relationsOfRelation, array_flip($withRelations)); $relationsOfRelation = array_intersect_key($relationsOfRelation, array_flip($withRelations));
} }
$this->leftJoinRelations($select, $relationTable, $relationsOfRelation, $withRelations); $this->leftJoinRelations($select, $relationTable, $relationTableAlias, $relationsOfRelation, $withRelations);
} }
} }