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

Correct #18499

Browse Source
This commit is contained in:
Bizley
2021-03-01 21:02:28 +01:00
committed by GitHub
parent 2774f3ea6c
commit 14f1138441
2 changed files with 39 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
framework/db/Query.php
View File

@ -246,13 +246,26 @@ class Query extends Component implements QueryInterface, ExpressionInterface
return [];
}
if (is_string($this->indexBy) && $this->indexBy && is_array($this->select) && !in_array($this->indexBy, $this->select)) {
if (strpos($this->indexBy, '.') === false && count($tables = $this->getTablesUsedInFrom()) > 0) {
$this->select[] = key($tables) . '.' . $this->indexBy;
} else {
$this->select[] = $this->indexBy;
if (is_string($this->indexBy) && $this->indexBy && is_array($this->select)) {
$isIndexByAnArray = false;
if (strpos($this->indexBy, '.')) {
$indexByParts = explode('.', $this->indexBy);
foreach ($indexByParts as $indexByPart) {
if (is_numeric($indexByPart)) {
$isIndexByAnArray = true;
break;
}
}
}
if (!$isIndexByAnArray && !in_array($this->indexBy, $this->select, true)) {
if (strpos($this->indexBy, '.') === false && count($tables = $this->getTablesUsedInFrom()) > 0) {
$this->select[] = key($tables) . '.' . $this->indexBy;
} else {
$this->select[] = $this->indexBy;
}
}
}
$rows = $this->createCommand($db)->queryAll();
return $this->populate($rows);