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
2020-12-17 14:17:03 +08:00
parent 33e5416dda
commit 0456a155c8
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Database/ActiveRecord.php
+2 -2
View File
@@ -234,9 +234,9 @@ class ActiveRecord extends BaseActiveRecord
$primary = $this->getPrimary(); $primary = $this->getPrimary();
if (!empty($primary)) { if (!empty($primary)) {
$sul = static::deleteAll([$primary => $this->getAttribute($primary)]); $sul = static::deleteByCondition([$primary => $this->getAttribute($primary)]);
} else { } else {
$sul = static::deleteAll($conditions); $sul = static::deleteByCondition($conditions);
} }
if (!$sul) { if (!$sul) {
return false; return false;
Database/Base/BaseActiveRecord.php
+2 -2
View File
@@ -171,7 +171,7 @@ abstract class BaseActiveRecord extends Component implements IOrm, \ArrayAccess
* @return null|string * @return null|string
* @throws Exception * @throws Exception
*/ */
public function getPrimary() public function getPrimary(): ?string
{ {
if (!$this->hasPrimary()) { if (!$this->hasPrimary()) {
return null; return null;
@@ -253,7 +253,7 @@ abstract class BaseActiveRecord extends Component implements IOrm, \ArrayAccess
* @return bool * @return bool
* @throws Exception * @throws Exception
*/ */
public static function delete($condition = NULL, $attributes = [], $if_condition_is_null = false): bool public static function deleteByCondition($condition = NULL, $attributes = [], $if_condition_is_null = false): bool
{ {
if (empty($condition)) { if (empty($condition)) {
if (!$if_condition_is_null) { if (!$if_condition_is_null) {