Mirrors/yii2
2
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2026-03-21 06:33:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

merge from yiisoft/yii2

Browse Source
This commit is contained in:
cuileon
2018-11-14 11:57:32 +08:00
parent 47df8a8cc0
commit 489dd119a5
426 changed files with 18465 additions and 4215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
framework/db/ActiveQuery.php
View File

@@ -172,11 +172,19 @@ class ActiveQuery extends Query implements ActiveQueryInterface
/* @var $viaQuery ActiveQuery */
list($viaName, $viaQuery) = $this->via;
if ($viaQuery->multiple) {
$viaModels = $viaQuery->all();
$this->primaryModel->populateRelation($viaName, $viaModels);
if ($this->primaryModel->isRelationPopulated($viaName)) {
$viaModels = $this->primaryModel->$viaName;
} else {
$viaModels = $viaQuery->all();
$this->primaryModel->populateRelation($viaName, $viaModels);
}
} else {
$model = $viaQuery->one();
$this->primaryModel->populateRelation($viaName, $model);
if ($this->primaryModel->isRelationPopulated($viaName)) {
$model = $this->primaryModel->$viaName;
} else {
$model = $viaQuery->one();
$this->primaryModel->populateRelation($viaName, $model);
}
$viaModels = $model === null ? [] : [$model];
}
$this->filterByModels($viaModels);
@@ -567,14 +575,15 @@ class ActiveQuery extends Query implements ActiveQueryInterface
/**
* Returns the table name and the table alias for [[modelClass]].
* @return array the table name and the table alias.
* @internal
* @since 2.0.16
*/
private function getTableNameAndAlias()
protected function getTableNameAndAlias()
{
if (empty($this->from)) {
$tableName = $this->getPrimaryTableName();
} else {
$tableName = '';
// if the first entry in "from" is an alias-tablename-pair return it directly
foreach ($this->from as $alias => $tableName) {
if (is_string($alias)) {
return [$tableName, $alias];