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

made indexBy callable like db AR

Browse Source
This commit is contained in:
Carsten Brandt
2013-09-24 19:09:59 +02:00
parent 3623fc19dc
commit 7850c8d238
2 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
framework/yii/redis/ActiveQuery.php
View File

@ -642,7 +642,12 @@ class ActiveQuery extends \yii\base\Component
return $rows; return $rows;
} }
foreach ($rows as $row) { foreach ($rows as $row) {
$models[$row[$this->indexBy]] = $row; if (is_string($this->indexBy)) {
$key = $row[$this->indexBy];
} else {
$key = call_user_func($this->indexBy, $row);
}
$models[$key] = $row;
} }
} else { } else {
/** @var $class ActiveRecord */ /** @var $class ActiveRecord */
@ -654,7 +659,12 @@ class ActiveQuery extends \yii\base\Component
} else { } else {
foreach ($rows as $row) { foreach ($rows as $row) {
$model = $class::create($row); $model = $class::create($row);
$models[$model->{$this->indexBy}] = $model; if (is_string($this->indexBy)) {
$key = $model->{$this->indexBy};
} else {
$key = call_user_func($this->indexBy, $model);
}
$models[$key] = $model;
} }
} }
} }

10
tests/unit/framework/redis/ActiveRecordTest.php
View File

@ -159,6 +159,16 @@ class ActiveRecordTest extends RedisTestCase
$this->assertTrue($customers['user1'] instanceof Customer); $this->assertTrue($customers['user1'] instanceof Customer);
$this->assertTrue($customers['user2'] instanceof Customer); $this->assertTrue($customers['user2'] instanceof Customer);
$this->assertTrue($customers['user3'] instanceof Customer); $this->assertTrue($customers['user3'] instanceof Customer);
// indexBy callable
$customers = Customer::find()->indexBy(function ($customer) {
return $customer->id . '-' . $customer->name;
// })->orderBy('id')->all();
})->all();
$this->assertEquals(3, count($customers));
$this->assertTrue($customers['1-user1'] instanceof Customer);
$this->assertTrue($customers['2-user2'] instanceof Customer);
$this->assertTrue($customers['3-user3'] instanceof Customer);
} }
public function testFindCount() public function testFindCount()