php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-03 05:48:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #15047: yii\db\Query::select() and yii\db\Query::addSelect() now check for duplicate column names

Browse Source
This commit is contained in:
wapmorgan
2018-02-02 10:59:31 +03:00
committed by Alexander Makarov
parent 8b74e29663
commit 5afe0a0d36
3 changed files with 81 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
framework/db/Query.php
View File

@ -594,7 +594,7 @@ PATTERN;
} elseif (!is_array($columns)) {
$columns = preg_split('/\s*,\s*/', trim($columns), -1, PREG_SPLIT_NO_EMPTY);
}
$this->select = $columns;
$this->select = $this->getUniqueColumns($columns);
$this->selectOption = $option;
return $this;
}
@ -621,6 +621,7 @@ PATTERN;
} elseif (!is_array($columns)) {
$columns = preg_split('/\s*,\s*/', trim($columns), -1, PREG_SPLIT_NO_EMPTY);
}
$columns = $this->getUniqueColumns($columns);
if ($this->select === null) {
$this->select = $columns;
} else {
@ -630,6 +631,51 @@ PATTERN;
return $this;
}
/**
* Returns unique column names excluding duplicates.
* Columns to be removed:
* - if column definition already present in SELECT part with same alias
* - if column definition without alias already present in SELECT part without alias too
* @param array $columns the columns to be merged to the select.
* @since 2.0.14
*/
protected function getUniqueColumns($columns)
{
$columns = array_unique($columns);
$unaliasedColumns = $this->getUnaliasedColumnsFromSelect();
foreach ($columns as $columnAlias => $columnDefinition) {
if ($columnDefinition instanceof Query) {
continue;
}
if (
(is_string($columnAlias) && isset($this->select[$columnAlias]) && $this->select[$columnAlias] === $columnDefinition)
|| (is_integer($columnAlias) && in_array($columnDefinition, $unaliasedColumns))
) {
unset($columns[$columnAlias]);
}
}
return $columns;
}
/**
* @return array List of columns without aliases from SELECT statement.
* @since 2.0.14
*/
protected function getUnaliasedColumnsFromSelect()
{
$result = [];
if (is_array($this->select)) {
foreach ($this->select as $name => $value) {
if (is_integer($name)) {
$result[] = $value;
}
}
}
return array_unique($result);
}
/**
* Sets the value indicating whether to SELECT DISTINCT or not.
* @param bool $value whether to SELECT DISTINCT or not.
@ -1180,4 +1226,13 @@ PATTERN;
'params' => $from->params,
]);
}
/**
* Returns the SQL representation of Query
* @return string
*/
public function __toString()
{
return serialize($this);
}
}