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

Merge branch 'master' into db-traits

Browse Source 
Updated AR classes with the latest changes from master to go on with
separation of AR query classes in traits.

Conflicts:
	framework/yii/db/ActiveQuery.php
	framework/yii/db/ActiveRecord.php
	framework/yii/db/ActiveRelation.php
This commit is contained in:
Carsten Brandt
2013-11-13 17:00:52 +01:00
parent b8e31d50bb 0eaafd74ba
commit c8c7f59d69
390 changed files with 6862 additions and 20510 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
framework/yii/db/ActiveRelation.php
View File

@ -30,6 +30,12 @@ class ActiveRelation extends ActiveQuery
{
use \yii\ar\ActiveRelationTrait;
/**
* @var array|ActiveRelation the query associated with the pivot table. Please call [[via()]]
* or [[viaTable()]] to set this property instead of directly setting it.
*/
public $via;
/**
* Specifies the pivot table.
* @param string $tableName the name of the pivot table.
@ -72,7 +78,7 @@ class ActiveRelation extends ActiveQuery
$this->filterByModels($viaModels);
} elseif (is_array($this->via)) {
// via relation
/** @var $viaQuery ActiveRelation */
/** @var ActiveRelation $viaQuery */
list($viaName, $viaQuery) = $this->via;
if ($viaQuery->multiple) {
$viaModels = $viaQuery->all();