From 6e03278a002fa632ba1bf2e05579e29e5efc95a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mr=C2=B7x?= <as2252258@163.com>
Date: Fri, 16 Apr 2021 20:37:45 +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/Base/BaseActiveRecord.php | 4 +++-
 Database/Mysql/Columns.php         | 6 +-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/Database/Base/BaseActiveRecord.php b/Database/Base/BaseActiveRecord.php
index 64975594..24e121c9 100644
--- a/Database/Base/BaseActiveRecord.php
+++ b/Database/Base/BaseActiveRecord.php
@@ -11,7 +11,6 @@ namespace Database\Base;
 
 
 use Annotation\Event;
-use Annotation\Inject;
 use ArrayAccess;
 use Database\ActiveQuery;
 use Database\ActiveRecord;
@@ -653,6 +652,9 @@ abstract class BaseActiveRecord extends Component implements IOrm, ArrayAccess
 			$oldValue = $this->_oldAttributes[$key] ?? null;
 			if ($val !== $oldValue) {
 				$_tmp[$key] = $this->toFormat($columns, $format, $key, $val);
+				if (is_bool($_tmp[$key])) {
+					unset($_tmp[$key]);
+				}
 			} else {
 				$condition[$key] = $val;
 			}
diff --git a/Database/Mysql/Columns.php b/Database/Mysql/Columns.php
index 37e094a3..e9bb3e33 100644
--- a/Database/Mysql/Columns.php
+++ b/Database/Mysql/Columns.php
@@ -155,11 +155,7 @@ class Columns extends Component
 		if ($this->isInt($format)) {
 			return (int)$val;
 		} else if ($this->isJson($format)) {
-			$data = Json::encode($val);
-			if (is_bool($data)) {
-				return Json::encode([]);
-			}
-			return $data;
+			return Json::encode($val);
 		} else if ($this->isFloat($format)) {
 			return (float)$val;
 		} else {