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

Merge pull request #4543 from slavcodev/refactoring-query

Browse Source 
Refactored ActiveQuery::one() to be consistent with all() creation
This commit is contained in:
Qiang Xue
2014-07-31 10:52:01 -04:00
parent 8615296b32 fa8e576251
commit c6e8f5a667
1 changed files with 2 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
framework/db/ActiveQuery.php
View File

@@ -242,24 +242,8 @@ class ActiveQuery extends Query implements ActiveQueryInterface
{
$row = parent::one($db);
if ($row !== false) {
if ($this->asArray) {
$model = $row;
} else {
/* @var $class ActiveRecord */
$class = $this->modelClass;
$model = $class::instantiate($row);
$class::populateRecord($model, $row);
}
if (!empty($this->with)) {
$models = [$model];
$this->findWith($this->with, $models);
$model = $models[0];
}
if (!$this->asArray) {
$model->afterFind();
}
return $model;
$models = $this->prepareResult([$row]);
return reset($models) ?: null;
} else {
return null;
}