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-08-06 18:05:50 +08:00
parent 26fc318af5
commit 99ddfe268e
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Database/Base/BaseActiveRecord.php
+3 -6
View File
@@ -538,18 +538,15 @@ abstract class BaseActiveRecord extends Component implements IOrm, ArrayAccess
if (!is_null($data)) { if (!is_null($data)) {
$this->_attributes = merge($this->_attributes, $data); $this->_attributes = merge($this->_attributes, $data);
} }
if (!$this->validator($this->rules())) { if (!$this->validator($this->rules()) || !$this->beforeSave($this)) {
return false; return false;
} }
if ($this->beforeSave($this)) { [$change, $condition, $fields] = $this->separation();
[$change, $condition, $fields] = $this->filtration_and_separation();
if (!$this->isNewExample) { if (!$this->isNewExample) {
return $this->updateInternal($fields, $condition, $change); return $this->updateInternal($fields, $condition, $change);
} }
return $this->insert($change, $fields); return $this->insert($change, $fields);
} }
return false;
}
/** /**
@@ -618,7 +615,7 @@ abstract class BaseActiveRecord extends Component implements IOrm, ArrayAccess
* @return array * @return array
* @throws Exception * @throws Exception
*/ */
private function filtration_and_separation(): array private function separation(): array
{ {
$_tmp = []; $_tmp = [];
$condition = []; $condition = [];