diff --git a/Database/ActiveRecord.php b/Database/ActiveRecord.php index 62e63c61..5a97130d 100644 --- a/Database/ActiveRecord.php +++ b/Database/ActiveRecord.php @@ -234,9 +234,9 @@ class ActiveRecord extends BaseActiveRecord $primary = $this->getPrimary(); if (!empty($primary)) { - $sul = static::deleteAll([$primary => $this->getAttribute($primary)]); + $sul = static::deleteByCondition([$primary => $this->getAttribute($primary)]); } else { - $sul = static::deleteAll($conditions); + $sul = static::deleteByCondition($conditions); } if (!$sul) { return false; diff --git a/Database/Base/BaseActiveRecord.php b/Database/Base/BaseActiveRecord.php index 8cfe2f3b..8d4caf96 100644 --- a/Database/Base/BaseActiveRecord.php +++ b/Database/Base/BaseActiveRecord.php @@ -171,7 +171,7 @@ abstract class BaseActiveRecord extends Component implements IOrm, \ArrayAccess * @return null|string * @throws Exception */ - public function getPrimary() + public function getPrimary(): ?string { if (!$this->hasPrimary()) { return null; @@ -253,7 +253,7 @@ abstract class BaseActiveRecord extends Component implements IOrm, \ArrayAccess * @return bool * @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 (!$if_condition_is_null) {