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

modify

Browse Source
This commit is contained in:
as2252258@163.com
2021-05-02 04:52:29 +08:00
parent d376042361
commit 1a11178875
1 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Database/ActiveRecord.php
+4 -12
View File
@@ -342,12 +342,10 @@ class ActiveRecord extends BaseActiveRecord
*/ */
public function hasOne(string $modelName, $foreignKey, $localKey): HasOne|ActiveQuery public function hasOne(string $modelName, $foreignKey, $localKey): HasOne|ActiveQuery
{ {
if (!isset($this->attributes[$localKey])) { if (($value = $this->getAttribute($localKey)) === null) {
throw new Exception("Need join table primary key."); throw new Exception("Need join table primary key.");
} }
$value = $this->getAttribute($localKey);
$relation = $this->getRelation(); $relation = $this->getRelation();
return new HasOne($modelName, $foreignKey, $value, $relation); return new HasOne($modelName, $foreignKey, $value, $relation);
@@ -363,12 +361,10 @@ class ActiveRecord extends BaseActiveRecord
*/ */
public function hasCount($modelName, $foreignKey, $localKey): mixed public function hasCount($modelName, $foreignKey, $localKey): mixed
{ {
if (!isset($this->attributes[$localKey])) { if (($value = $this->getAttribute($localKey)) === null) {
throw new Exception("Need join table primary key."); throw new Exception("Need join table primary key.");
} }
$value = $this->getAttribute($localKey);
$relation = $this->getRelation(); $relation = $this->getRelation();
return new HasCount($modelName, $foreignKey, $value, $relation); return new HasCount($modelName, $foreignKey, $value, $relation);
@@ -384,12 +380,10 @@ class ActiveRecord extends BaseActiveRecord
*/ */
public function hasMany($modelName, $foreignKey, $localKey): mixed public function hasMany($modelName, $foreignKey, $localKey): mixed
{ {
if (!isset($this->attributes[$localKey])) { if (($value = $this->getAttribute($localKey)) === null) {
throw new Exception("Need join table primary key."); throw new Exception("Need join table primary key.");
} }
$value = $this->getAttribute($localKey);
$relation = $this->getRelation(); $relation = $this->getRelation();
return new HasMany($modelName, $foreignKey, $value, $relation); return new HasMany($modelName, $foreignKey, $value, $relation);
@@ -404,12 +398,10 @@ class ActiveRecord extends BaseActiveRecord
*/ */
public function hasIn($modelName, $foreignKey, $localKey): mixed public function hasIn($modelName, $foreignKey, $localKey): mixed
{ {
if (!isset($this->attributes[$localKey])) { if (($value = $this->getAttribute($localKey)) === null) {
throw new Exception("Need join table primary key."); throw new Exception("Need join table primary key.");
} }
$value = $this->getAttribute($localKey);
$relation = $this->getRelation(); $relation = $this->getRelation();
return new HasMany($modelName, $foreignKey, $value, $relation); return new HasMany($modelName, $foreignKey, $value, $relation);