From 7a202df84914bdc5f55019d00839024029e05ad9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mr=C2=B7x?= Date: Tue, 27 Apr 2021 16:22:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Database/ActiveRecord.php | 4 ++-- Database/Base/BaseActiveRecord.php | 11 +++++------ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/Database/ActiveRecord.php b/Database/ActiveRecord.php index 4539dc02..18c55f35 100644 --- a/Database/ActiveRecord.php +++ b/Database/ActiveRecord.php @@ -313,8 +313,8 @@ class ActiveRecord extends BaseActiveRecord } $data = array_merge($data, $this->runRelate()); -// $class = Snowflake::app()->getChannel(); -// $class->push($this, static::class); + $class = Snowflake::app()->getChannel(); + $class->push($this, static::class); return $data; } diff --git a/Database/Base/BaseActiveRecord.php b/Database/Base/BaseActiveRecord.php index 1bc854f6..ca436fe0 100644 --- a/Database/Base/BaseActiveRecord.php +++ b/Database/Base/BaseActiveRecord.php @@ -1036,12 +1036,11 @@ abstract class BaseActiveRecord extends Component implements IOrm, ArrayAccess */ public static function populate(array $data): static { -// $class = Snowflake::app()->getChannel(); -// /** @var static $model */ -// $model = $class->pop(static::class, function () { -// return new static(); -// }); - $model = new static(); + $class = Snowflake::app()->getChannel(); + /** @var static $model */ + $model = $class->pop(static::class, function () { + return new static(); + }); $model->_attributes = $data; $model->_oldAttributes = $data; $model->setIsCreate(false);