Skip to content

Y
yii2
Commit c50d5872 by Qiang Xue
Options

..

parent df003215
Showing with 1 addition and 6 deletions
framework/db/ar/ActiveFinder.php
...@@ -318,12 +318,7 @@ class ActiveFinder extends \yii\base\Object ...@@ -318,12 +318,7 @@ class ActiveFinder extends \yii\base\Object
} }
if ($element->query instanceof ActiveRelation) { if ($element->query instanceof ActiveRelation) {
$joinType = $joinType = $element->query->joinType ?: 'LEFT JOIN';
if ($element->query->joinType === null) {
$joinType = 'LEFT JOIN';
} else {
$joinType = $element->query->joinType;
}
if ($element->query->modelClass !== null) { if ($element->query->modelClass !== null) {
$modelClass = $element->query->modelClass; $modelClass = $element->query->modelClass;
$tableName = $this->connection->quoteTableName($modelClass::tableName()); $tableName = $this->connection->quoteTableName($modelClass::tableName());
......
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