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

feature/use-the-same-table-in-multiple-joins #14

Merged
bence merged 3 commits from feature/use-the-same-table-in-multiple-joins into master 2023-05-01 19:08:23 +02:00
Conversation 0 Commits 3 Files Changed 2 +32 -33
2 changed files with 32 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/Database/Query/Select.php
View File

@ -276,13 +276,12 @@ class Select
return [(string) $table, $params]; return [(string) $table, $params];
} }
if ($table instanceof Select) if ($table instanceof Select) {
{
return $table->generateQuery(); return $table->generateQuery();
} }
if (isset($this->tableAliases[$table])) { if (isset($this->tableAliases[$table])) {
$queryString = ($defineAlias ? Utils::backtick($this->tableAliases[$table]) . ' ' . Utils::backtick($table) : Utils::backtick($table)); $queryString = $defineAlias ? Utils::backtick($this->tableAliases[$table]) . ' ' . Utils::backtick($table) : Utils::backtick($table);
return [$queryString, $params]; return [$queryString, $params];
} }
@ -295,24 +294,17 @@ class Select
return (string) $column; return (string) $column;
} }
if (is_array($column)) { if (!is_array($column)) {
$out = ''; $column = [$this->table, $column];
if ($column[0]) {
list($tableName, $params) = $this->generateTable($column[0]);
$out .= $tableName . '.';
} }
$out .= Utils::backtick($column[1]); list($tableName, $params) = $this->generateTable($column[0]);
$out = $tableName . '.' . Utils::backtick($column[1]);
if (!empty($column[2])) { if (!empty($column[2])) {
$out .= ' ' . Utils::backtick($column[2]); $out .= ' ' . Utils::backtick($column[2]);
} }
return $out; return $out;
} else {
return Utils::backtick($column);
}
} }
private function generateColumns(): string private function generateColumns(): string

23
src/PersistentData/PersistentDataManager.php
View File

@ -148,7 +148,7 @@ class PersistentDataManager implements IPersistentDataManager
$relations = array_intersect_key($relations, array_flip($withRelations)); $relations = array_intersect_key($relations, array_flip($withRelations));
} }
$columns = array_merge($columns, $this->getRelationColumns($relations, $withRelations)); $columns = array_merge($columns, $this->getRelationColumns($table, $relations, $withRelations));
$this->leftJoinRelations($select, $table, $relations, $withRelations); $this->leftJoinRelations($select, $table, $relations, $withRelations);
$select->columns($columns); $select->columns($columns);
@ -159,21 +159,22 @@ class PersistentDataManager implements IPersistentDataManager
return $select; return $select;
} }
private function getRelationColumns(array $relations, array $withRelations): array private function getRelationColumns(string $table, array $relations, array $withRelations): array
{ {
$columns = []; $columns = [];
foreach ($relations as $relation => $relationType) { foreach ($relations as $relation => $relationType) {
$relationTableAlias = $table . '__' . $relation;
$relationTable = call_user_func([$relationType, 'getTable']); $relationTable = call_user_func([$relationType, 'getTable']);
foreach (call_user_func([$relationType, 'getFields']) as $relationField) { foreach (call_user_func([$relationType, 'getFields']) as $relationField) {
$columns[] = [$relationTable, $relationField, $relation . '__' . $relationField]; $columns[] = [$relationTableAlias, $relationField, $relation . '__' . $relationField];
} }
$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));
} }
$columns = array_merge($columns, $this->getRelationColumns($relationsOfRelation, $withRelations)); $columns = array_merge($columns, $this->getRelationColumns($relationTable, $relationsOfRelation, $withRelations));
} }
return $columns; return $columns;
@ -182,14 +183,16 @@ class PersistentDataManager implements IPersistentDataManager
private function leftJoinRelations(Select $select, string $table, array $relations, array $withRelations): void private function leftJoinRelations(Select $select, string $table, array $relations, array $withRelations): void
{ {
foreach ($relations as $relation => $relationType) { foreach ($relations as $relation => $relationType) {
$relationTableAlias = $table . '__' . $relation;
$relationTable = call_user_func([$relationType, 'getTable']); $relationTable = call_user_func([$relationType, 'getTable']);
$select->leftJoin($relationTable, [$relationTable, 'id'], '=', [$table, $relation . '_id']); $select->setTableAliases([$relationTableAlias => $relationTable]);
$select->leftJoin($relationTableAlias, [$relationTableAlias, 'id'], '=', [$table, $relation . '_id']);
$nextOrderRelations = call_user_func([$relationType, 'getRelations']); $relationsOfRelation = call_user_func([$relationType, 'getRelations']);
if (count($withRelations)) { if (count($withRelations)) {
$nextOrderRelations = array_intersect_key($nextOrderRelations, array_flip($withRelations)); $relationsOfRelation = array_intersect_key($relationsOfRelation, array_flip($withRelations));
} }
$this->leftJoinRelations($select, $relationTable, $nextOrderRelations, $withRelations); $this->leftJoinRelations($select, $relationTable, $relationsOfRelation, $withRelations);
} }
} }
@ -224,12 +227,16 @@ class PersistentDataManager implements IPersistentDataManager
next($data); next($data);
} else if (substr($key, 0, strlen($relation . '__')) === $relation . '__') { } else if (substr($key, 0, strlen($relation . '__')) === $relation . '__') {
if ($data[$relation . '__id'] !== null) {
$relationType = current($relations); $relationType = current($relations);
$relationModel = new $relationType(); $relationModel = new $relationType();
$this->fillWithData($data, $relationModel, $withRelations, $relation); $this->fillWithData($data, $relationModel, $withRelations, $relation);
$method = 'set' . str_replace('_', '', ucwords($relation, '_')); $method = 'set' . str_replace('_', '', ucwords($relation, '_'));
$model->$method($relationModel); $model->$method($relationModel);
} else {
next($data);
}
next($relations); next($relations);
} else { } else {