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-07-28 19:20:16 +08:00
parent b7cc3f9158
commit ec8fa8381b
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Database/ActiveRecord.php
+10 -11
View File
@@ -14,7 +14,6 @@ use Database\Base\BaseActiveRecord;
use Database\Traits\HasBase; use Database\Traits\HasBase;
use Exception; use Exception;
use ReflectionException; use ReflectionException;
use Snowflake\Channel;
use Snowflake\Exception\NotFindClassException; use Snowflake\Exception\NotFindClassException;
use Snowflake\Snowflake; use Snowflake\Snowflake;
@@ -228,13 +227,14 @@ class ActiveRecord extends BaseActiveRecord
/** /**
* @param $condition * @param mixed $condition
* @param array $attributes * @param array $attributes
* *
* @return bool * @return bool
* @throws Exception * @throws NotFindClassException
* @throws ReflectionException
*/ */
public static function updateAll(mixed $condition, $attributes = []): bool public static function updateAll(mixed $condition, array $attributes = []): bool
{ {
$condition = static::find()->where($condition); $condition = static::find()->where($condition);
return $condition->batchUpdate($attributes); return $condition->batchUpdate($attributes);
@@ -247,7 +247,7 @@ class ActiveRecord extends BaseActiveRecord
* @return array|Collection * @return array|Collection
* @throws Exception * @throws Exception
*/ */
public static function findAll($condition, $attributes = []): array|Collection public static function findAll($condition, array $attributes = []): array|Collection
{ {
$query = static::find()->where($condition); $query = static::find()->where($condition);
if (!empty($attributes)) { if (!empty($attributes)) {
@@ -291,8 +291,7 @@ class ActiveRecord extends BaseActiveRecord
foreach ($lists as $key => $item) { foreach ($lists as $key => $item) {
$data[$key] = $this->{$item}($data[$key] ?? null); $data[$key] = $this->{$item}($data[$key] ?? null);
} }
$data = array_merge($data, $this->runRelate()); return array_merge($data, $this->runRelate());
return $data;
} }
/** /**
@@ -335,10 +334,10 @@ class ActiveRecord extends BaseActiveRecord
* @param $modelName * @param $modelName
* @param $foreignKey * @param $foreignKey
* @param $localKey * @param $localKey
* @return ActiveQuery * @return ActiveQuery|HasCount
* @throws Exception * @throws Exception
*/ */
public function hasCount($modelName, $foreignKey, $localKey): mixed public function hasCount($modelName, $foreignKey, $localKey): ActiveQuery|HasCount
{ {
if (($value = $this->getAttribute($localKey)) === null) { if (($value = $this->getAttribute($localKey)) === null) {
throw new Exception("Need join table primary key."); throw new Exception("Need join table primary key.");
@@ -357,7 +356,7 @@ class ActiveRecord extends BaseActiveRecord
* @return ActiveQuery * @return ActiveQuery
* @throws Exception * @throws Exception
*/ */
public function hasMany($modelName, $foreignKey, $localKey): mixed public function hasMany($modelName, $foreignKey, $localKey): ActiveQuery|HasMany
{ {
if (($value = $this->getAttribute($localKey)) === null) { if (($value = $this->getAttribute($localKey)) === null) {
throw new Exception("Need join table primary key."); throw new Exception("Need join table primary key.");
@@ -375,7 +374,7 @@ class ActiveRecord extends BaseActiveRecord
* @return ActiveQuery * @return ActiveQuery
* @throws Exception * @throws Exception
*/ */
public function hasIn($modelName, $foreignKey, $localKey): mixed public function hasIn($modelName, $foreignKey, $localKey): ActiveQuery|HasMany
{ {
if (($value = $this->getAttribute($localKey)) === null) { if (($value = $this->getAttribute($localKey)) === null) {
throw new Exception("Need join table primary key."); throw new Exception("Need join table primary key.");