diff --git a/Base/Model.php b/Base/Model.php index 770f2ef..7ae9eed 100644 --- a/Base/Model.php +++ b/Base/Model.php @@ -19,9 +19,11 @@ use Database\ActiveQuery; use Database\Collection; use Database\Connection; use Database\DatabasesProviders; +use Database\HasOne; use Database\ModelInterface; use Database\Relation; use Database\SqlBuilder; +use Database\Traits\HasBase; use Exception; use Kiri\Di\Context; use Kiri; @@ -741,7 +743,11 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \ return NULL; } - return $this->{'get' . ucfirst($name)}(); + $result = $this->{'get' . ucfirst($name)}(); + if ($result instanceof \Database\Traits\Relation) { + return $result->get(); + } + return $result; }