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 +12 -20
1 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e9bfe4e4ad - Show all commits

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