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

fixed empty result in findByPk list

Browse Source
This commit is contained in:
Carsten Brandt
2013-09-30 15:39:04 +02:00
parent b95c056b02
commit 179618c6e9
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -315,9 +315,12 @@ class ActiveQuery extends \yii\base\Component
foreach($pks as $pk) { foreach($pks as $pk) {
if (++$i > $start && ($this->limit === null || $i <= $start + $this->limit)) { if (++$i > $start && ($this->limit === null || $i <= $start + $this->limit)) {
$key = $modelClass::tableName() . ':a:' . $modelClass::buildKey($pk); $key = $modelClass::tableName() . ':a:' . $modelClass::buildKey($pk);
$data[] = $db->executeCommand('HGETALL', array($key)); $result = $db->executeCommand('HGETALL', array($key));
if ($type === 'One' && $this->orderBy === null) { if (!empty($result)) {
break; $data[] = $result;
if ($type === 'One' && $this->orderBy === null) {
break;
}
} }
} }
} }

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

@@ -97,6 +97,10 @@ class ActiveRecordTest extends RedisTestCase
$this->assertEquals('user2', $customer->name); $this->assertEquals('user2', $customer->name);
$customer = Customer::find(5); $customer = Customer::find(5);
$this->assertNull($customer); $this->assertNull($customer);
$customer = Customer::find(array('id' => array(5, 6, 1)));
$this->assertEquals(1, count($customer));
$customer = Customer::find()->where(array('id' => array(5, 6, 1)))->one();
$this->assertNotNull($customer);
// query scalar // query scalar
$customerName = Customer::find()->where(array('id' => 2))->scalar('name'); $customerName = Customer::find()->where(array('id' => 2))->scalar('name');