php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-12 11:40:19 +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 []; return [];
} }
if (is_string($this->indexBy) && $this->indexBy && is_array($this->select) && !in_array($this->indexBy, $this->select)) { if (is_string($this->indexBy) && $this->indexBy && is_array($this->select)) {
if (strpos($this->indexBy, '.') === false && count($tables = $this->getTablesUsedInFrom()) > 0) { $isIndexByAnArray = false;
$this->select[] = key($tables) . '.' . $this->indexBy; if (strpos($this->indexBy, '.')) {
} else { $indexByParts = explode('.', $this->indexBy);
$this->select[] = $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(); $rows = $this->createCommand($db)->queryAll();
return $this->populate($rows); return $this->populate($rows);

21
tests/framework/db/ActiveRecordTest.php
View File

@@ -2095,4 +2095,25 @@ abstract class ActiveRecordTest extends DatabaseTestCase
} }
} }
} }
/**
* @see https://github.com/yiisoft/yii2/issues/18525
*/
public function testHasManyWithIndexBy()
{
$category = Category::find()->joinWith('items')->indexBy('items.0.name');
$this->assertEquals(['Agile Web Application Development with Yii1.1 and PHP5', 'Ice Age'], array_keys($category->all()));
$category = Category::find()->select([Category::tableName() . '.*'])->joinWith('items')->indexBy('items.0.name');
$this->assertEquals(['Agile Web Application Development with Yii1.1 and PHP5', 'Ice Age'], array_keys($category->all()));
$category = Category::find()->select([Category::tableName() . '.*'])->joinWith('items')->indexBy('name');
$this->assertEquals(['Books', 'Movies'], array_keys($category->all()));
$category = Category::find()->joinWith('items')->indexBy('item.name');
$this->assertEquals([''], array_keys($category->all()));
$category = Category::find()->select([Category::tableName() . '.name'])->joinWith('items')->indexBy('id');
$this->assertEquals([1, 2], array_keys($category->all()));
}
} }