Commit b62b4eae by Paul Klimov

Sphinx Active Relation lazy load fixed.

parent 9ea4ef13
...@@ -19,4 +19,35 @@ use yii\db\ActiveRelationTrait; ...@@ -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);
}
} }
\ No newline at end of file
...@@ -30,6 +30,7 @@ class ActiveRelationTest extends SphinxTestCase ...@@ -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()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment