refactored function and variable names, and replaced variables in inner scope
default-pipeline default-pipeline #173
default-pipeline default-pipeline #173
This commit is contained in:
1 parent
886bd02f88
commit
b2535ad78a
3 files changed
+13
-12
No files matched your search
@@ -223,8 +223,8 @@ class Select
|
||||
|
||||
private function generateQuery(): array
|
||||
{
|
||||
list($innerQuery, $innerParams) = $this->generateTable($this->table, true);
|
||||
$queryString = 'SELECT ' . $this->generateColumns() . ' FROM ' . $innerQuery;
|
||||
list($tableQuery, $tableParams) = $this->generateTable($this->table, true);
|
||||
$queryString = 'SELECT ' . $this->generateColumns() . ' FROM ' . $tableQuery;
|
||||
|
||||
if (count($this->joins) > 0) {
|
||||
list($joinQuery, $joinParams) = $this->generateJoins();
|
||||
@@ -265,7 +265,7 @@ class Select
|
||||
$queryString = '(' . $queryString . ') AS ' . $this->tableAliases[Select::DERIVED_TABLE_KEY];
|
||||
}
|
||||
|
||||
return [$queryString, array_merge($innerParams, $joinParams, $whereParams, $havingParams)];
|
||||
return [$queryString, array_merge($tableParams, $joinParams, $whereParams, $havingParams)];
|
||||
}
|
||||
|
||||
private function generateTable($table, bool $defineAlias = false): array
|
||||
|
||||
Reference in new issue
Block a user