as2252258/kiri-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

改名

Browse Source
This commit is contained in:
Mr·x
2021-04-16 20:37:45 +08:00
parent 48616882a0
commit 6e03278a00
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Database/Base/BaseActiveRecord.php
+3 -1
View File
@@ -11,7 +11,6 @@ namespace Database\Base;
use Annotation\Event; use Annotation\Event;
use Annotation\Inject;
use ArrayAccess; use ArrayAccess;
use Database\ActiveQuery; use Database\ActiveQuery;
use Database\ActiveRecord; use Database\ActiveRecord;
@@ -653,6 +652,9 @@ abstract class BaseActiveRecord extends Component implements IOrm, ArrayAccess
$oldValue = $this->_oldAttributes[$key] ?? null; $oldValue = $this->_oldAttributes[$key] ?? null;
if ($val !== $oldValue) { if ($val !== $oldValue) {
$_tmp[$key] = $this->toFormat($columns, $format, $key, $val); $_tmp[$key] = $this->toFormat($columns, $format, $key, $val);
if (is_bool($_tmp[$key])) {
unset($_tmp[$key]);
}
} else { } else {
$condition[$key] = $val; $condition[$key] = $val;
} }
Database/Mysql/Columns.php
+1 -5
View File
@@ -155,11 +155,7 @@ class Columns extends Component
if ($this->isInt($format)) { if ($this->isInt($format)) {
return (int)$val; return (int)$val;
} else if ($this->isJson($format)) { } else if ($this->isJson($format)) {
$data = Json::encode($val); return Json::encode($val);
if (is_bool($data)) {
return Json::encode([]);
}
return $data;
} else if ($this->isFloat($format)) { } else if ($this->isFloat($format)) {
return (float)$val; return (float)$val;
} else { } else {