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

fixed offset and limit in redis AR

Browse Source
This commit is contained in:
Carsten Brandt
2013-09-18 17:49:56 +02:00
parent 563171eba4
commit 72889128fc
2 changed files with 75 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -107,7 +107,7 @@ class ActiveQuery extends \yii\base\Component
$db = $modelClass::getDb();
if (($primaryKeys = $this->primaryKeys) === null) {
$start = $this->offset === null ? 0 : $this->offset;
$end = $this->limit === null ? -1 : $start + $this->limit;
$end = $this->limit === null ? -1 : $start + $this->limit - 1;
$primaryKeys = $db->executeCommand('LRANGE', array($modelClass::tableName(), $start, $end));
}
$rows = array();
@@ -145,7 +145,7 @@ class ActiveQuery extends \yii\base\Component
$db = $modelClass::getDb();
if (($primaryKeys = $this->primaryKeys) === null) {
$start = $this->offset === null ? 0 : $this->offset;
$primaryKeys = $db->executeCommand('LRANGE', array($modelClass::tableName(), $start, $start + 1));
$primaryKeys = $db->executeCommand('LRANGE', array($modelClass::tableName(), $start, $start));
}
$pk = reset($primaryKeys);
$key = $modelClass::tableName() . ':a:' . $modelClass::hashPk($pk);
@@ -184,7 +184,13 @@ class ActiveQuery extends \yii\base\Component
$modelClass = $this->modelClass;
/** @var Connection $db */
$db = $modelClass::getDb();
return $db->executeCommand('LLEN', array($modelClass::tableName()));
if ($this->offset === null && $this->limit === null) {
return $db->executeCommand('LLEN', array($modelClass::tableName()));
} else {
$start = $this->offset === null ? 0 : $this->offset;
$end = $this->limit === null ? -1 : $start + $this->limit - 1;
return count($db->executeCommand('LRANGE', array($modelClass::tableName(), $start, $end)));
}
}
/**
@@ -225,7 +231,7 @@ class ActiveQuery extends \yii\base\Component
* Sets the LIMIT part of the query.
* TODO: refactor, it is duplicated from yii/db/Query
* @param integer $limit the limit
* @return Query the query object itself
* @return ActiveQuery the query object itself
*/
public function limit($limit)
{
@@ -237,7 +243,7 @@ class ActiveQuery extends \yii\base\Component
* Sets the OFFSET part of the query.
* TODO: refactor, it is duplicated from yii/db/Query
* @param integer $offset the offset
* @return Query the query object itself
* @return ActiveQuery the query object itself
*/
public function offset($offset)
{