eee

ActiveQuery.php

@@ -73,6 +73,48 @@ class ActiveQuery extends QueryTrait implements ISqlBuilder
     }
 
 
+    /**
+     * @param string $column
+     * @param int|float $amount
+     * @return bool
+     */
+    public function increment(string $column, int|float $amount = 1): bool
+    {
+        return (bool)$this->buildCommand($this->builder->mathematics([$column => $amount]))->exec();
+    }
+
+
+    /**
+     * @param array $attributes
+     * @return bool
+     */
+    public function increments(array $attributes): bool
+    {
+        return (bool)$this->buildCommand($this->builder->mathematics($attributes))->exec();
+    }
+
+
+    /**
+     * @param string $column
+     * @param int|float $amount
+     * @return bool
+     */
+    public function decrement(string $column, int|float $amount = 1): bool
+    {
+        return (bool)$this->buildCommand($this->builder->mathematics([$column => $amount], '-'))->exec();
+    }
+
+
+    /**
+     * @param array $attributes
+     * @return bool
+     */
+    public function decrements(array $attributes): bool
+    {
+        return (bool)$this->buildCommand($this->builder->mathematics($attributes, '-'))->exec();
+    }
+
+
     /**
      * @throws
      */
@@ -95,7 +137,7 @@ class ActiveQuery extends QueryTrait implements ISqlBuilder
             return;
         }
         if (Context::inCoroutine()) {
-            Coroutine::create(fn() => $closure($data));
+            Coroutine::create(fn () => $closure($data));
         } else {
             call_user_func($closure, $data);
         }

Base/Model.php

@@ -1,4 +1,5 @@
-<?php /** @noinspection ALL */
+<?php
+/** @noinspection ALL */
 /**
  * Created by PhpStorm.
  * User: whwyy
@@ -22,6 +23,7 @@ use Database\ModelInterface;
 use Database\Relation;
 use Database\SqlBuilder;
 use Exception;
+use Kiri\Di\Context;
 use Kiri;
 use Kiri\Abstracts\Component;
 use ReturnTypeWillChange;
@@ -222,8 +224,8 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
      */
     public function getPrimaryValue(): ?int
     {
-        if ($this->hasPrimary()) {
-            return (int)$this->_oldAttributes[$this->getPrimary()] ?? null;
+        if ($this->hasPrimary() && isset($this->_oldAttributes[$this->getPrimary()])) {
+            return (int)$this->_oldAttributes[$this->getPrimary()];
         } else {
             return null;
         }
@@ -234,23 +236,25 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
      * @return Model|null
      * @throws
      */
-    public static function findOne(int|string|array $param): ?static
+    public static function findOne(int|string|array|null $param): ?static
     {
-        $model = static::instance();
-        $query = new ActiveQuery($model);
+        if (empty($param)) {
+            return null;
+        }
+        $query = new ActiveQuery($model = static::instance());
         $query->from($model->getTable())->alias('t1');
         if (is_numeric($param)) {
-            $query->where([$model->getPrimary() => $param]);
+            $query->where([$model->getPrimary() => +$param]);
         } else if (is_array($param)) {
             $query->where($param);
         } else {
             $query->whereRaw($param);
         }
-        $data = $query->first();
-        if ($data === false) {
+        if (($data = $query->first()) === false) {
             throw new Exception($model->getLastError());
+        } else {
+            return $data;
         }
-        return $data;
     }
 
 
@@ -436,14 +440,17 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
     private function insert(): bool|static
     {
         $sql    = SqlBuilder::builder($query = static::query())->insert($this->_attributes);
-        $lastId = $this->getConnection()->createCommand($sql, $query->params)->save();
+        $lastId = $this->getConnection()->createCommand($sql, $query->params)->exec();
         if ($lastId === false) {
             return false;
         }
-        if ($this->hasPrimary()) {
-            $this->_attributes[$this->getPrimary()] = $lastId;
+        if (!$this->hasPrimary()) {
+            return $this->refresh()->afterSave($this->_attributes, []);
         }
-        return $this;
+
+        $this->_attributes[$this->getPrimary()] = $lastId;
+
+        return $this->refresh()->afterSave($this->_attributes, [$this->getPrimary() => $lastId]);
     }
 
 
@@ -464,7 +471,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
         if ($generate === false) {
             return false;
         }
-        if (!$this->getConnection()->createCommand($generate, $query->params)->save()) {
+        if (!$this->getConnection()->createCommand($generate, $query->params)->exec()) {
             return FALSE;
         }
         return $this->refresh()->afterSave($old, $change);
@@ -591,7 +598,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
      */
     public function getRelation(): ?Relation
     {
-        return Kiri::getDi()->get(Relation::class);
+        return di(Relation::class);
     }
 
 
@@ -653,6 +660,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
     public function refresh(): static
     {
         $this->_oldAttributes = $this->_attributes;
+        $this->isNewExample   = false;
         return $this;
     }
 

Command.php

@@ -47,15 +47,6 @@ class Command extends Component
         return (bool)$this->_prepare();
     }
 
-    /**
-     * @return bool
-     * @throws
-     */
-    public function save(): bool
-    {
-        return (bool)$this->_prepare();
-    }
-
 
     /**
      * @return bool|array
@@ -118,6 +109,7 @@ class Command extends Component
     {
         $client = $this->connection->getConnection();
         try {
+            $startTime = microtime(true);
             if (($prepare = $client->prepare($this->sql)) === false) {
                 throw new Exception('(' . $prepare->errorInfo()[0] . ')' . $client->errorInfo()[2]);
             }
@@ -127,7 +119,7 @@ class Command extends Component
             $result = $method == 'rowCount' ? $prepare->rowCount() : $prepare->{$method}(PDO::FETCH_ASSOC);
             $prepare->closeCursor();
 
-            $this->connection->println($this->sql, $this->params);
+            $this->connection->println($startTime, microtime(true), $this->sql, $this->params);
 
             return $result;
         } catch (Throwable $throwable) {
@@ -160,6 +152,7 @@ class Command extends Component
     {
         $client = $this->connection->getConnection();
         try {
+            $startTime = microtime(true);
             if (($prepare = $client->prepare($this->sql)) === false) {
                 throw new Exception('(' . $prepare->errorInfo()[0] . ')' . $prepare->errorInfo()[2]);
             }
@@ -170,7 +163,7 @@ class Command extends Component
 
             $result = $client->lastInsertId();
 
-            $this->connection->println($this->sql, $this->params);
+            $this->connection->println($startTime, microtime(true), $this->sql, $this->params);
 
             return $result == 0 ? $prepare->rowCount() : (int)$result;
         } catch (Throwable $throwable) {

Connection.php

@@ -67,6 +67,14 @@ class Connection extends Component
     #[Container(LoggerInterface::class)]
     public StdoutLogger $logger;
 
+
+    /**
+     * @var EventProvider
+     */
+    #[Container(EventProvider::class)]
+    public EventProvider $eventProvider;
+
+
     /**
      * @param Pool $connections
      */
@@ -79,14 +87,16 @@ class Connection extends Component
 
 
     /**
+     * @param float $startTime
+     * @param float $endTime
      * @param string $sql
      * @param array $params
      * @return void
      */
-    public function println(string $sql, array $params = []): void
+    public function println(float $startTime, float $endTime, string $sql, array $params = []): void
     {
         if (is_callable($this->_println)) {
-            call_user_func($this->_println, $sql, $params);
+            call_user_func($this->_println, $startTime, $endTime, $sql, $params);
         }
     }
 
@@ -97,14 +107,13 @@ class Connection extends Component
      */
     public function init(): void
     {
-        $eventProvider = Kiri::getDi()->get(EventProvider::class);
-        $eventProvider->on(BeginTransaction::class, [$this, 'beginTransaction'], 0);
-        $eventProvider->on(Rollback::class, [$this, 'rollback'], 0);
-        $eventProvider->on(Commit::class, [$this, 'commit'], 0);
-        $eventProvider->on(OnAfterRequest::class, [$this, 'clear']);
-        $eventProvider->on(OnWorkerExit::class, [$this, 'disconnect']);
-        $eventProvider->on(OnWorkerStart::class, [$this, 'tick']);
-        $eventProvider->on(OnTaskerStart::class, [$this, 'tick']);
+        $this->eventProvider->on(BeginTransaction::class, [$this, 'beginTransaction'], 0);
+        $this->eventProvider->on(Rollback::class, [$this, 'rollback'], 0);
+        $this->eventProvider->on(Commit::class, [$this, 'commit'], 0);
+        $this->eventProvider->on(OnAfterRequest::class, [$this, 'clear']);
+        $this->eventProvider->on(OnWorkerExit::class, [$this, 'disconnect']);
+        $this->eventProvider->on(OnWorkerStart::class, [$this, 'tick']);
+        $this->eventProvider->on(OnTaskerStart::class, [$this, 'tick']);
     }
 
 
@@ -113,7 +122,7 @@ class Connection extends Component
      */
     public function tick(): void
     {
-        $this->timerId = Timer::tick($this->tick_time, fn() => $this->checkClientHealth($this->pool()));
+        $this->timerId = Timer::tick($this->tick_time, fn () => $this->checkClientHealth($this->pool()));
     }
 
 
@@ -348,7 +357,6 @@ class Connection extends Component
     public function newConnect(): \PDO
     {
         $pdo = new PDO($this->database, $this->cds, $this->username, $this->password, [
-//        $pdo = new \PDO('mysql:dbname=' . $this->database . ';host=' . $this->cds, $this->username, $this->password, [
             \PDO::ATTR_CASE               => \PDO::CASE_NATURAL,
             \PDO::ATTR_ERRMODE            => \PDO::ERRMODE_EXCEPTION,
             \PDO::ATTR_ORACLE_NULLS       => \PDO::NULL_NATURAL,

HasCount.php

@@ -4,8 +4,8 @@ declare(strict_types=1);
 namespace Database;
 
 use Database\Traits\HasBase;
-use Exception;
 use Kiri;
+use Kiri\Di\Context;
 
 /**
  * Class HasCount
@@ -20,8 +20,7 @@ class HasCount extends HasBase
      */
     public function get(): array|ModelInterface|null
     {
-        $relation = Kiri::getDi()->get(Relation::class);
-        return $relation->get($this->name);
+        return di(Relation::class)->get($this->name);
     }
 
 }

HasMany.php

@@ -12,6 +12,7 @@ namespace Database;
 use Database\Traits\HasBase;
 use Exception;
 use Kiri;
+use Kiri\Di\Context;
 
 /**
  * Class HasMany
@@ -28,7 +29,6 @@ class HasMany extends HasBase
      */
     public function get(): array|Collection|null
     {
-        $relation = Kiri::getDi()->get(Relation::class);
-        return $relation->get($this->name);
+        return di(Relation::class)->get($this->name);
     }
 }

HasOne.php

@@ -12,6 +12,7 @@ namespace Database;
 use Database\Traits\HasBase;
 use Exception;
 use Kiri;
+use Kiri\Di\Context;
 
 /**
  * Class HasOne
@@ -27,7 +28,6 @@ class HasOne extends HasBase
      */
     public function get(): array|ModelInterface|null
     {
-        $relation = Kiri::getDi()->get(Relation::class);
-        return $relation->first($this->name);
+        return di(Relation::class)->first($this->name);
     }
 }

Model.php

@@ -266,21 +266,21 @@ class Model extends Base\Model
 
 
     /**
-     * @param ModelInterface|string $modelName
+     * @param string $modelName
      * @param string $foreignKey
      * @param string $localKey
      * @return string
      * @throws Exception
      */
-    private function _hasBase(ModelInterface|string $modelName, string $foreignKey, string $localKey): string
+    private function _hasBase(string $modelName, string $foreignKey, string $localKey): string
     {
         if (($value = $this->{$localKey}) === null) {
             throw new Exception("Need join table primary key.");
         }
 
-        $relation = $this->getRelation();
+        $relation = di(Relation::class);
 
-        $primaryKey = $modelName . $foreignKey . $value;
+        $primaryKey = str_replace('\\', '_', $modelName) . '_' . $foreignKey . '_' . $value;
         if (!$relation->hasIdentification($primaryKey)) {
             $relation->bindIdentification($primaryKey, $modelName::query()->where([$foreignKey => $value]));
         }
@@ -289,59 +289,59 @@ class Model extends Base\Model
 
 
     /**
-     * @param ModelInterface|string $modelName
+     * @param string $modelName
      * @param string $foreignKey
      * @param string $localKey
      * @return HasOne|ActiveQuery
      * @throws Exception
      */
-    public function hasOne(ModelInterface|string $modelName, string $foreignKey, string $localKey): HasOne|ActiveQuery
+    public function hasOne(string $modelName, string $foreignKey, string $localKey): HasOne|ActiveQuery
     {
         return new HasOne($this->_hasBase($modelName, $foreignKey, $localKey));
     }
 
 
     /**
-     * @param ModelInterface|string $modelName
+     * @param string $modelName
      * @param string $foreignKey
      * @param string $localKey
      * @return ActiveQuery|HasCount
      * @throws Exception
      */
-    public function hasCount(ModelInterface|string $modelName, string $foreignKey, string $localKey): ActiveQuery|HasCount
+    public function hasCount(string $modelName, string $foreignKey, string $localKey): ActiveQuery|HasCount
     {
         return new HasCount($this->_hasBase($modelName, $foreignKey, $localKey));
     }
 
 
     /**
-     * @param ModelInterface|string $modelName
+     * @param string $modelName
      * @param string $foreignKey
      * @param string $localKey
      * @return ActiveQuery|HasMany
      * @throws Exception
      */
-    public function hasMany(ModelInterface|string $modelName, string $foreignKey, string $localKey): ActiveQuery|HasMany
+    public function hasMany(string $modelName, string $foreignKey, string $localKey): ActiveQuery|HasMany
     {
         return new HasMany($this->_hasBase($modelName, $foreignKey, $localKey));
     }
 
     /**
-     * @param ModelInterface|string $modelName
+     * @param string $modelName
      * @param string $foreignKey
      * @param string $localKey
      * @return ActiveQuery|HasMany
      * @throws Exception
      */
-    public function hasIn(ModelInterface|string $modelName, string $foreignKey, string $localKey): ActiveQuery|HasMany
+    public function hasIn(string $modelName, string $foreignKey, string $localKey): ActiveQuery|HasMany
     {
         if (($value = $this->{$localKey}) === null) {
             throw new Exception("Need join table primary key.");
         }
 
-        $relation = $this->getRelation();
+        $relation = di(Relation::class);
 
-        $primaryKey = $modelName . $foreignKey . json_encode($value, JSON_UNESCAPED_UNICODE);
+        $primaryKey = str_replace('\\', '_', $modelName) . '_' . $foreignKey . '_' . implode('_', $value);
         if (!$relation->hasIdentification($primaryKey)) {
             $relation->bindIdentification($primaryKey, $modelName::query()->whereIn($foreignKey, $value));
         }

ModelInterface.php

@@ -18,10 +18,10 @@ interface ModelInterface
 {
 
     /**
-     * @param array|string|int $param
+     * @param array|string|int|null $param
      * @return ModelInterface|null
      */
-    public static function findOne(array|string|int $param): ?static;
+    public static function findOne(array|string|int|null $param): ?static;
 
 
     /**

Relation.php

@@ -4,8 +4,10 @@ declare(strict_types=1);
 namespace Database;
 
 
+use Database\Base\ActiveQueryInterface;
 use Kiri\Abstracts\Component;
 use Kiri\Di\Context;
+use Swoole\Coroutine;
 
 /**
  * Class Relation
@@ -34,7 +36,7 @@ class Relation extends Component
      */
     public function hasIdentification(string $identification): bool
     {
-        return isset($this->_query[$identification]) && $this->_query[$identification] instanceof ActiveQuery;
+        return isset($this->_query[$identification]);
     }
 
     /**
@@ -54,12 +56,10 @@ class Relation extends Component
      */
     public function first(string $_identification): mixed
     {
-        if (Context::exists($_identification)) {
-            return Context::get($_identification);
+        if (!Context::exists($_identification)) {
+            Context::set($_identification, $this->_query[$_identification]->first());
         }
-        $activeModel = $this->_query[$_identification]->first();
-        unset($this->_query[$_identification]);
-        return Context::set($_identification, $activeModel);
+        return Context::get($_identification);
     }
 
 
@@ -69,12 +69,10 @@ class Relation extends Component
      */
     public function count(string $_identification): mixed
     {
-        if (Context::exists($_identification)) {
-            return Context::get($_identification);
+        if (!Context::exists($_identification)) {
+            Context::set($_identification, $this->_query[$_identification]->count());
         }
-        $activeModel = $this->_query[$_identification]->count();
-        unset($this->_query[$_identification]);
-        return Context::set($_identification, $activeModel);
+        return Context::get($_identification);
     }
 
 
@@ -86,11 +84,9 @@ class Relation extends Component
     public function get(string $_identification): mixed
     {
         if (Context::exists($_identification)) {
-            return Context::get($_identification);
+            Context::set($_identification, $this->_query[$_identification]->get());
         }
-        $activeModel = $this->_query[$_identification]->get();
-        unset($this->_query[$_identification]);
-        return Context::set($_identification, $activeModel);
+        return Context::get($_identification);
     }
 
 }

SqlBuilder.php

@@ -51,7 +51,7 @@ class SqlBuilder extends Component
      */
     public function getCondition(): string
     {
-        return $this->where($this->query->where);
+        return $this->where($this->query->getWhere());
     }
 
 
@@ -73,9 +73,9 @@ class SqlBuilder extends Component
      */
     public function update(array $attributes): bool|string
     {
-        $conditions          = $this->query->params;
-        $this->query->params = [];
-        $data                = $this->__updateBuilder($this->makeParams($attributes));
+        $conditions = $this->query->getParams();
+        $this->query->setParams([]);
+        $data = $this->__updateBuilder($this->makeParams($attributes));
         foreach ($conditions as $condition) {
             $this->query->pushParam($condition);
         }
@@ -109,7 +109,7 @@ class SqlBuilder extends Component
         if (empty($string)) {
             return Kiri::getLogger()->failure('None data update.');
         }
-        return 'UPDATE ' . $this->query->from . ' SET ' . implode(',', $string) . $this->make();
+        return 'UPDATE ' . $this->query->getFrom() . ' SET ' . implode(',', $string) . $this->make();
     }
 
 
@@ -121,7 +121,7 @@ class SqlBuilder extends Component
      */
     public function insert(array $attributes, bool $isBatch = false): string
     {
-        $update = 'INSERT INTO ' . $this->query->from;
+        $update = 'INSERT INTO ' . $this->query->getFrom();
         if ($isBatch === false) {
             $attributes = [$attributes];
         }
@@ -143,7 +143,7 @@ class SqlBuilder extends Component
      */
     public function delete(): string
     {
-        return 'DELETE FROM ' . $this->query->from . $this->make();
+        return 'DELETE FROM ' . $this->query->getFrom() . $this->make();
     }
 
 
@@ -215,7 +215,7 @@ class SqlBuilder extends Component
      */
     public function one(): string
     {
-        return $this->makeSelect($this->query->select) . $this->make() . $this->makeLimit($this->query->limit(1));
+        return $this->makeSelect($this->query->getSelect()) . $this->make() . $this->makeLimit($this->query->limit(1));
     }
 
 
@@ -225,7 +225,7 @@ class SqlBuilder extends Component
      */
     public function all(): string
     {
-        return $this->makeSelect($this->query->select) . $this->make() . $this->makeLimit($this->query);
+        return $this->makeSelect($this->query->getSelect()) . $this->make() . $this->makeLimit($this->query);
     }
 
 
@@ -277,12 +277,12 @@ class SqlBuilder extends Component
      */
     private function makeSelect(array $select = ['*']): string
     {
-        $select = "SELECT " . implode(',', $select) . " FROM " . $this->query->from;
-        if ($this->query->alias != "") {
-            $select .= " AS " . $this->query->alias;
+        $select = "SELECT " . implode(',', $select) . " FROM " . $this->query->getFrom();
+        if ($this->query->getAlias() != "") {
+            $select .= " AS " . $this->query->getAlias();
         }
-        if (count($this->query->join) > 0) {
-            $select .= ' ' . implode(' ', $this->query->join);
+        if (count($this->query->getJoin()) > 0) {
+            $select .= ' ' . implode(' ', $this->query->getJoin());
         }
         return $select;
     }
@@ -293,8 +293,8 @@ class SqlBuilder extends Component
      */
     private function makeGroup(): string
     {
-        if ($this->query->group != "") {
-            return ' GROUP BY ' . $this->query->group;
+        if ($this->query->getGroup() != "") {
+            return ' GROUP BY ' . $this->query->getGroup();
         }
         return '';
     }
@@ -305,8 +305,8 @@ class SqlBuilder extends Component
      */
     private function makeOrder(): string
     {
-        if (count($this->query->order) > 0) {
-            return ' ORDER BY ' . implode(',', $this->query->order);
+        if (count($this->query->getOrder()) > 0) {
+            return ' ORDER BY ' . implode(',', $this->query->getOrder());
         }
         return '';
     }
@@ -317,7 +317,7 @@ class SqlBuilder extends Component
      */
     private function makeCondition(): string
     {
-        $condition = $this->where($this->query->where);
+        $condition = $this->where($this->query->getWhere());
         if (empty($condition)) {
             return '';
         }
@@ -327,8 +327,8 @@ class SqlBuilder extends Component
 
     private function makeLimit(): string
     {
-        if ($this->query->offset >= 0 && $this->query->limit >= 1) {
-            return ' LIMIT ' . $this->query->offset . ',' . $this->query->limit;
+        if ($this->query->getOffset() >= 0 && $this->query->getLimit() >= 1) {
+            return ' LIMIT ' . $this->query->getOffset() . ',' . $this->query->getLimit();
         }
         return '';
     }
@@ -354,7 +354,7 @@ class SqlBuilder extends Component
      */
     public function truncate(): string
     {
-        return sprintf('TRUNCATE %s', $this->query->from);
+        return sprintf('TRUNCATE %s', $this->query->getFrom());
     }
 
 

Traits/HasBase.php

@@ -13,6 +13,7 @@ use Database\ModelInterface;
 use Database\Collection;
 use Database\Relation;
 use Kiri;
+use Kiri\Di\Context;
 
 /**
  * Class HasBase
@@ -52,12 +53,16 @@ abstract class HasBase implements \Database\Traits\Relation
      * @param string $name
      * @param array $arguments
      * @return $this|mixed
+     * @throws \Exception
      */
     public function __call(string $name, array $arguments)
     {
         if ($name !== 'get') {
-            $relation = Kiri::getDi()->get(Relation::class);
-            $relation->getQuery($this->name)->$name(...$arguments);
+            $query    = di(Relation::class)->getQuery($this->name);
+            if (is_null($query)) {
+                throw new \Exception('Unknown relation key: ' . $this->name);
+            }
+            $query->$name(...$arguments);
             return $this;
         } else {
             return $this->get();

Traits/QueryTrait.php

@@ -64,32 +64,191 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 
 
     /**
-     * @param string $name
-     * @return mixed
-     * @throws Exception
+     * @param array $where
+     * @return void
      */
-    public function __get(string $name)
+    public function setWhere(array $where): void
     {
-        if (property_exists($this, $name)) {
-            return $this->$name;
-        }
-        return parent::__get($name); // TODO: Change the autogenerated stub
+        $this->where = $where;
     }
 
 
     /**
-     * @param string $name
-     * @param $value
+     * @param array $select
      * @return void
-     * @throws Exception
      */
-    public function __set(string $name, $value): void
+    public function setSelect(array $select): void
     {
-        if (property_exists($this, $name)) {
-            $this->{$name} = $value;
-        } else {
-            parent::__set($name, $value); // TODO: Change the autogenerated stub
-        }
+        $this->select = $select;
+    }
+
+
+    /**
+     * @param array $join
+     * @return void
+     */
+    public function setJoin(array $join): void
+    {
+        $this->join = $join;
+    }
+
+
+    /**
+     * @param array $order
+     * @return void
+     */
+    public function setOrder(array $order): void
+    {
+        $this->order = $order;
+    }
+
+
+    /**
+     * @param int $offset
+     * @return void
+     */
+    public function setOffset(int $offset): void
+    {
+        $this->offset = $offset;
+    }
+
+
+    /**
+     * @param int $limit
+     * @return void
+     */
+    public function setLimit(int $limit): void
+    {
+        $this->limit = $limit;
+    }
+
+
+    /**
+     * @param string $group
+     * @return void
+     */
+    public function setGroup(string $group): void
+    {
+        $this->group = $group;
+    }
+
+
+    /**
+     * @param string $from
+     * @return void
+     */
+    public function setFrom(string $from): void
+    {
+        $this->from = $from;
+    }
+
+
+    /**
+     * @param string $alias
+     * @return void
+     */
+    public function setAlias(string $alias): void
+    {
+        $this->alias = $alias;
+    }
+
+    /**
+     * @param array $params
+     * @return void
+     */
+    public function setParams(array $params): void
+    {
+        $this->params = $params;
+    }
+
+
+    /**
+     * @return array
+     */
+    public function getWhere(): array
+    {
+        return $this->where;
+    }
+
+
+    /**
+     * @return array|string[]
+     */
+    public function getSelect(): array
+    {
+        return $this->select;
+    }
+
+
+    /**
+     * @return array
+     */
+    public function getJoin(): array
+    {
+        return $this->join;
+    }
+
+
+    /**
+     * @return array
+     */
+    public function getOrder(): array
+    {
+        return $this->order;
+    }
+
+
+    /**
+     * @return int
+     */
+    public function getOffset(): int
+    {
+        return $this->offset;
+    }
+
+
+    /**
+     * @return int
+     */
+    public function getLimit(): int
+    {
+        return $this->limit;
+    }
+
+
+    /**
+     * @return string
+     */
+    public function getGroup(): string
+    {
+        return $this->group;
+    }
+
+
+    /**
+     * @return string
+     */
+    public function getFrom(): string
+    {
+        return $this->from;
+    }
+
+
+    /**
+     * @return string
+     */
+    public function getAlias(): string
+    {
+        return $this->alias;
+    }
+
+
+    /**
+     * @return array
+     */
+    public function getParams(): array
+    {
+        return $this->params;
     }
 
 

test.php

@@ -0,0 +1,13 @@
+<?php
+
+
+class Users extends \Database\Model
+{
+
+
+
+    public function hasD()
+    {
+        return $this->hasOne(static::class, 'id', 'id')->with([]);
+    }
+}