diff --git a/Database/ActiveRecord.php b/Database/ActiveRecord.php index 693c6571..555e7104 100644 --- a/Database/ActiveRecord.php +++ b/Database/ActiveRecord.php @@ -10,16 +10,13 @@ declare(strict_types=1); namespace Database; -use Annotation\Model\Get; use Exception; use Database\Base\BaseActiveRecord; use ReflectionException; -use Snowflake\Core\ArrayAccess; -use Snowflake\Error\Logger; use Snowflake\Exception\ComponentException; use Snowflake\Exception\NotFindClassException; use Snowflake\Snowflake; -use Swoole\Coroutine; +use Database\Traits\HasBase; defined('SAVE_FAIL') or define('SAVE_FAIL', 3227); defined('FIND_OR_CREATE_MESSAGE') or define('FIND_OR_CREATE_MESSAGE', 'Create a new model, but the data cannot be empty.'); diff --git a/Database/HasCount.php b/Database/HasCount.php index f39173a4..a993fa60 100644 --- a/Database/HasCount.php +++ b/Database/HasCount.php @@ -4,6 +4,7 @@ declare(strict_types=1); namespace Database; use Exception; +use Database\Traits\HasBase; /** * Class HasCount diff --git a/Database/HasMany.php b/Database/HasMany.php index 4280a4d3..24f08d81 100644 --- a/Database/HasMany.php +++ b/Database/HasMany.php @@ -9,6 +9,7 @@ declare(strict_types=1); namespace Database; use Exception; +use Database\Traits\HasBase; /** * Class HasMany diff --git a/Database/HasOne.php b/Database/HasOne.php index e7c563df..347eec66 100644 --- a/Database/HasOne.php +++ b/Database/HasOne.php @@ -10,6 +10,7 @@ declare(strict_types=1); namespace Database; use Exception; +use Database\Traits\HasBase; /** * Class HasOne diff --git a/Database/HasBase.php b/Database/Traits/HasBase.php similarity index 92% rename from Database/HasBase.php rename to Database/Traits/HasBase.php index 0ee4b802..935adcb6 100644 --- a/Database/HasBase.php +++ b/Database/Traits/HasBase.php @@ -7,8 +7,12 @@ */ declare(strict_types=1); -namespace Database; +namespace Database\Traits; +use Database\ActiveRecord; +use Database\Collection; +use Database\IOrm; +use Database\Relation; use Exception; /**