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

Sphinx Active Relation lazy load fixed.

Browse Source
This commit is contained in:
Paul Klimov
2013-12-16 15:54:32 +02:00
parent 9ea4ef13fe
commit b62b4eae2b
2 changed files with 32 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
extensions/yii/sphinx/ActiveRelation.php
View File

@ -19,4 +19,35 @@ use yii\db\ActiveRelationTrait;
class ActiveRelation extends ActiveQuery implements ActiveRelationInterface class ActiveRelation extends ActiveQuery implements ActiveRelationInterface
{ {
use ActiveRelationTrait; use ActiveRelationTrait;
/**
* @inheritdoc
*/
public function createCommand($db = null)
{
if ($this->primaryModel !== null) {
// lazy loading
if ($this->via instanceof self) {
// via pivot index
$viaModels = $this->via->findPivotRows([$this->primaryModel]);
$this->filterByModels($viaModels);
} elseif (is_array($this->via)) {
// via relation
/** @var ActiveRelation $viaQuery */
list($viaName, $viaQuery) = $this->via;
if ($viaQuery->multiple) {
$viaModels = $viaQuery->all();
$this->primaryModel->populateRelation($viaName, $viaModels);
} else {
$model = $viaQuery->one();
$this->primaryModel->populateRelation($viaName, $model);
$viaModels = $model === null ? [] : [$model];
}
$this->filterByModels($viaModels);
} else {
$this->filterByModels([$this->primaryModel]);
}
}
return parent::createCommand($db);
}
} }

1
tests/unit/extensions/sphinx/ActiveRelationTest.php
View File

@ -30,6 +30,7 @@ class ActiveRelationTest extends SphinxTestCase
$this->assertTrue($article->isRelationPopulated('index')); $this->assertTrue($article->isRelationPopulated('index'));
$this->assertTrue($index instanceof ArticleIndex); $this->assertTrue($index instanceof ArticleIndex);
$this->assertEquals(1, count($article->populatedRelations)); $this->assertEquals(1, count($article->populatedRelations));
$this->assertEquals($article->id, $index->id);
} }
public function testFindEager() public function testFindEager()