Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
yii2
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
PSDI Army
yii2
Commits
b62b4eae
Commit
b62b4eae
authored
Dec 16, 2013
by
Paul Klimov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Sphinx Active Relation lazy load fixed.
parent
9ea4ef13
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
33 additions
and
0 deletions
+33
-0
ActiveRelation.php
extensions/yii/sphinx/ActiveRelation.php
+32
-0
ActiveRelationTest.php
tests/unit/extensions/sphinx/ActiveRelationTest.php
+1
-0
No files found.
extensions/yii/sphinx/ActiveRelation.php
View file @
b62b4eae
...
@@ -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
tests/unit/extensions/sphinx/ActiveRelationTest.php
View file @
b62b4eae
...
@@ -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
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment