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

Replaces commit dfcf037c7. The prvious idea was wrong and broke some tests

Browse Source
This commit is contained in:
SilverFire - Dmitry Naumenko
2019-01-20 13:50:27 +02:00
parent dfcf037c76
commit 025dd072c6
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
framework/db/ActiveQuery.php
View File

@ -772,11 +772,7 @@ class ActiveQuery extends Query implements ActiveQueryInterface
*/ */
public function viaTable($tableName, $link, callable $callable = null) public function viaTable($tableName, $link, callable $callable = null)
{ {
if ($this->primaryModel === null) { $modelClass = $this->primaryModel ? get_class($this->primaryModel) : $this->modelClass;
throw new InvalidConfigException('The "primaryModel" property is not set. The query must be a relation to use junction tables. You probably need to call hasOne() or hasMany() method first.');
}
$modelClass = get_class($this->primaryModel);
$relation = new self($modelClass, [ $relation = new self($modelClass, [
'from' => [$tableName], 'from' => [$tableName],
'link' => $link, 'link' => $link,