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 #15353: Remove side effect of ActiveQuery::getTablesUsedInFrom() introduced in 2.0.13

Browse Source
This commit is contained in:
Alexander
2018-01-15 12:02:28 +02:00
committed by Alexander Makarov
parent 6c0540aa2d
commit f8990ac97a
4 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
framework/db/ActiveQuery.php
View File

@ -809,7 +809,7 @@ class ActiveQuery extends Query implements ActiveQueryInterface
public function getTablesUsedInFrom()
{
if (empty($this->from)) {
$this->from = [$this->getPrimaryTableName()];
return $this->cleanUpTableNames([$this->getPrimaryTableName()]);
}
return parent::getTablesUsedInFrom();

13
framework/db/Query.php
View File

@ -479,7 +479,18 @@ class Query extends Component implements QueryInterface
throw new InvalidConfigException(gettype($this->from) . ' in $from is not supported.');
}
// Clean up table names and aliases
return $this->cleanUpTableNames($tableNames);
}
/**
* Clean up table names and aliases
* Both aliases and names are enclosed into {{ and }}.
* @param array $tableNames non-empty array
* @return string[] table names indexed by aliases
* @since 2.0.14
*/
protected function cleanUpTableNames($tableNames)
{
$cleanedUpTableNames = [];
foreach ($tableNames as $alias => $tableName) {
if (is_string($tableName) && !is_string($alias)) {