eee

ActiveQuery.php

@@ -22,208 +22,272 @@ class ActiveQuery extends QueryTrait implements ISqlBuilder
 {
 
 
-    public bool     $asArray = FALSE;
+	public bool     $asArray = FALSE;
-    protected mixed $_mock   = null;
+	protected mixed $_mock   = NULL;
 
 
-    /**
+	/**
-     * @param bool $asArray
+	 * @param bool $asArray
-     * @return static
+	 *
-     */
+	 * @return static
-    public function asArray(bool $asArray = true): static
+	 */
-    {
+	public function asArray(bool $asArray = TRUE): static
-        $this->asArray = $asArray;
+	{
-        return $this;
+		$this->asArray = $asArray;
-    }
+		return $this;
+	}
 
-    /**
+	/**
-     * @param array $methods
+	 * @param array $methods
-     * @return $this
+	 *
-     */
+	 * @return $this
-    public function with(array $methods): static
+	 */
-    {
+	public function with(array $methods): static
-        $this->modelClass->setWith($methods);
+	{
-        return $this;
+		$this->modelClass->setWith($methods);
-    }
+		return $this;
+	}
 
 
-    /**
+	/**
-     * @return ModelInterface|array|null|bool
+	 * @return ModelInterface|array|null|bool
-     * @throws
+	 * @throws
-     */
+	 */
-    public function first(): ModelInterface|null|array|bool
+	public function first(): ModelInterface|null|array|bool
-    {
+	{
-        $data = $this->buildCommand($this->builder->one())->one();
+		$data = $this->buildCommand($this->builder->one())->one();
-        if (is_array($data)) {
+		if (is_array($data)) {
-            return $this->populate($data);
+			return $this->populate($data);
-        }
+		}
-        return null;
+		return NULL;
-    }
+	}
 
-    /**
+	/**
-     * @return bool|Collection
+	 * @return bool|Collection
-     */
+	 */
-    public function get(): bool|Collection
+	public function get(): bool|Collection
-    {
+	{
-        $data = $this->buildCommand($this->builder->all())->all();
+		$data = $this->buildCommand($this->builder->all())->all();
-        if (is_array($data)) {
+		if (is_array($data)) {
-            return new Collection($this, $this->modelClass, $data);
+			return new Collection($this, $this->modelClass, $data);
-        }
+		}
-        return false;
+		return FALSE;
-    }
+	}
 
 
-    /**
+	/**
-     * @throws
+	 * @param string    $column
-     */
+	 * @param int|float $amount
-    public function flush(): bool
+	 *
-    {
+	 * @return bool
-        return (bool)$this->buildCommand($this->builder->truncate())->exec();
+	 */
-    }
+	public function increment(string $column, int|float $amount = 1): bool
+	{
+		return (bool)$this->buildCommand($this->builder->mathematics([$column => $amount]))->exec();
+	}
 
 
-    /**
+	/**
-     * @param int $size
+	 * @param array $attributes
-     * @param Closure $closure
+	 *
-     * @return void
+	 * @return bool
-     */
+	 */
-    public function chunk(int $size, Closure $closure): void
+	public function increments(array $attributes): bool
-    {
+	{
-        if ($this->offset === -1) $this->offset = 0;
+		return (bool)$this->buildCommand($this->builder->mathematics($attributes))->exec();
-        $data = $this->offset($this->offset)->limit($size)->get();
+	}
-        if (!$data || $data->isEmpty()) {
-            return;
-        }
-        if (Context::inCoroutine()) {
-            Coroutine::create(fn() => $closure($data));
-        } else {
-            call_user_func($closure, $data);
-        }
-        $this->offset += $size;
-        $this->chunk($size, $closure);
-    }
-
-    /**
-     * @param string $field
-     * @param string|null $setKey
-     *
-     * @return array|null
-     */
-    public function column(string $field, ?string $setKey = null): ?array
-    {
-        return $this->get()->column($field, $setKey);
-    }
 
 
-    /**
+	/**
-     * @param mixed $value
+	 * @param string    $column
-     * @return $this
+	 * @param int|float $amount
-     */
+	 *
-    public function withMock(mixed $value): static
+	 * @return bool
-    {
+	 */
-        $this->_mock = $value;
+	public function decrement(string $column, int|float $amount = 1): bool
-        return $this;
+	{
-    }
+		return (bool)$this->buildCommand($this->builder->mathematics([$column => $amount], '-'))->exec();
+	}
 
 
-    /**
+	/**
-     * @return mixed
+	 * @param array $attributes
-     */
+	 *
-    public function mock(): mixed
+	 * @return bool
-    {
+	 */
-        return $this->_mock;
+	public function decrements(array $attributes): bool
-    }
+	{
+		return (bool)$this->buildCommand($this->builder->mathematics($attributes, '-'))->exec();
+	}
 
 
-    /**
+	/**
-     * @param array $data
+	 * @throws
-     * @return ModelInterface|array
+	 */
-     * @throws
+	public function flush(): bool
-     */
+	{
-    public function populate(array $data): ModelInterface|array
+		return (bool)$this->buildCommand($this->builder->truncate())->exec();
-    {
+	}
-        $model = $this->modelClass->populates($data);
-
-        return $this->asArray ? $model->toArray() : $model;
-    }
 
 
-    /**
+	/**
-     * @return int
+	 * @param int     $size
-     * @throws
+	 * @param Closure $closure
-     */
+	 *
-    public function count(): int
+	 * @return void
-    {
+	 */
-        return $this->buildCommand($this->builder->count())->rowCount();
+	public function chunk(int $size, Closure $closure): void
-    }
+	{
+		if ($this->offset === -1) $this->offset = 0;
+		$data = $this->offset($this->offset)->limit($size)->get();
+		if (!$data || $data->isEmpty()) {
+			return;
+		}
+		if (Context::inCoroutine()) {
+			Coroutine::create(fn() => $closure($data));
+		} else {
+			call_user_func($closure, $data);
+		}
+		$this->offset += $size;
+		$this->chunk($size, $closure);
+	}
+
+	/**
+	 * @param string      $field
+	 * @param string|null $setKey
+	 *
+	 * @return array|null
+	 */
+	public function column(string $field, ?string $setKey = NULL): ?array
+	{
+		return $this->get()->column($field, $setKey);
+	}
 
 
-    /**
+	/**
-     * @param array $data
+	 * @param mixed $value
-     * @return bool
+	 *
-     * @throws
+	 * @return $this
-     */
+	 */
-    public function update(array $data): bool
+	public function withMock(mixed $value): static
-    {
+	{
-        if (count($data) < 1) {
+		$this->_mock = $value;
-            return true;
+		return $this;
-        }
+	}
-        $generate = $this->builder->update($data);
-        if (!is_bool($generate)) {
-            return (bool)$this->buildCommand($generate)->exec();
-        } else {
-            return $generate;
-        }
-    }
-
-    /**
-     * @param array $data
-     * @return bool
-     */
-    public function insert(array $data): bool
-    {
-        $sql = $this->builder->insert($data, isset($data[0]));
-
-        return (bool)$this->buildCommand($sql)->exec();
-    }
-
-    /**
-     * @param string $filed
-     *
-     * @return mixed
-     * @throws
-     */
-    public function value(string $filed): mixed
-    {
-        return $this->first()[$filed] ?? NULL;
-    }
-
-    /**
-     * @return bool
-     * @throws
-     */
-    public function exists(): bool
-    {
-        return $this->buildCommand($this->limit(1)->builder->exists())->exists();
-    }
 
 
-    /**
+	/**
-     * @param string $sql
+	 * @return mixed
-     * @param array $params
+	 */
-     * @return int|bool
+	public function mock(): mixed
-     */
+	{
-    public function execute(string $sql, array $params = []): int|bool
+		return $this->_mock;
-    {
+	}
-        return $this->buildCommand($sql, $params)->exec();
-    }
 
 
-    /**
+	/**
-     * @return bool
+	 * @param array $data
-     */
+	 *
-    public function delete(): bool
+	 * @return ModelInterface|array
-    {
+	 * @throws
-        return $this->buildCommand($this->builder->delete())->delete();
+	 */
-    }
+	public function populate(array $data): ModelInterface|array
+	{
+		$model = $this->modelClass->populates($data);
+
+		return $this->asArray ? $model->toArray() : $model;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function toSql(): string
+	{
+		return $this->builder->get();
+	}
+
+
+	/**
+	 * @return int
+	 * @throws
+	 */
+	public function count(): int
+	{
+		return $this->buildCommand($this->builder->count())->rowCount();
+	}
+
+
+	/**
+	 * @param array $data
+	 *
+	 * @return bool
+	 * @throws
+	 */
+	public function update(array $data): bool
+	{
+		if (count($data) < 1) {
+			return TRUE;
+		}
+		$generate = $this->builder->update($data);
+		if (!is_bool($generate)) {
+			return (bool)$this->buildCommand($generate)->exec();
+		} else {
+			return $generate;
+		}
+	}
+
+	/**
+	 * @param array $data
+	 *
+	 * @return bool
+	 */
+	public function insert(array $data): bool
+	{
+		$sql = $this->builder->insert($data, isset($data[0]));
+
+		return (bool)$this->buildCommand($sql)->exec();
+	}
+
+
+	/**
+	 * @param string $filed
+	 *
+	 * @return mixed
+	 * @throws
+	 */
+	public function value(string $filed): mixed
+	{
+		return $this->first()[$filed] ?? NULL;
+	}
+
+	/**
+	 * @return bool
+	 * @throws
+	 */
+	public function exists(): bool
+	{
+		return $this->buildCommand($this->limit(1)->builder->exists())->exists();
+	}
+
+
+	/**
+	 * @param string $sql
+	 * @param array  $params
+	 *
+	 * @return int|bool
+	 */
+	public function execute(string $sql, array $params = []): int|bool
+	{
+		return $this->buildCommand($sql, $params)->exec();
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function delete(): bool
+	{
+		return $this->buildCommand($this->builder->delete())->delete();
+	}
 }

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);
+        $this->eventProvider->on(BeginTransaction::class, [$this, 'beginTransaction'], 0);
-        $eventProvider->on(BeginTransaction::class, [$this, 'beginTransaction'], 0);
+        $this->eventProvider->on(Rollback::class, [$this, 'rollback'], 0);
-        $eventProvider->on(Rollback::class, [$this, 'rollback'], 0);
+        $this->eventProvider->on(Commit::class, [$this, 'commit'], 0);
-        $eventProvider->on(Commit::class, [$this, 'commit'], 0);
+        $this->eventProvider->on(OnAfterRequest::class, [$this, 'clear']);
-        $eventProvider->on(OnAfterRequest::class, [$this, 'clear']);
+        $this->eventProvider->on(OnWorkerExit::class, [$this, 'disconnect']);
-        $eventProvider->on(OnWorkerExit::class, [$this, 'disconnect']);
+        $this->eventProvider->on(OnWorkerStart::class, [$this, 'tick']);
-        $eventProvider->on(OnWorkerStart::class, [$this, 'tick']);
+        $this->eventProvider->on(OnTaskerStart::class, [$this, 'tick']);
-        $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 di(Relation::class)->get($this->name);
-        return $relation->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 di(Relation::class)->get($this->name);
-        return $relation->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 di(Relation::class)->first($this->name);
-        return $relation->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)) {
+        if (!Context::exists($_identification)) {
-            return Context::get($_identification);
+            Context::set($_identification, $this->_query[$_identification]->first());
         }
-        $activeModel = $this->_query[$_identification]->first();
+        return Context::get($_identification);
-        unset($this->_query[$_identification]);
-        return Context::set($_identification, $activeModel);
     }
 
 
@@ -69,12 +69,10 @@ class Relation extends Component
      */
     public function count(string $_identification): mixed
     {
-        if (Context::exists($_identification)) {
+        if (!Context::exists($_identification)) {
-            return Context::get($_identification);
+            Context::set($_identification, $this->_query[$_identification]->count());
         }
-        $activeModel = $this->_query[$_identification]->count();
+        return Context::get($_identification);
-        unset($this->_query[$_identification]);
-        return Context::set($_identification, $activeModel);
     }
 
 
@@ -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();
+        return Context::get($_identification);
-        unset($this->_query[$_identification]);
-        return Context::set($_identification, $activeModel);
     }
 
 }

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;
+        $conditions = $this->query->getParams();
-        $this->query->params = [];
+        $this->query->setParams([]);
-        $data                = $this->__updateBuilder($this->makeParams($attributes));
+        $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();
     }
 
 
@@ -189,7 +189,7 @@ class SqlBuilder extends Component
         if (is_null($value)) {
             return $keys;
         }
-        if (is_string($value) && $this->isMath($value)) {
+        if (preg_match('/^[+|-]\s\d+$/', $value)) {
             $keys[] = $key . '=' . $key . ' ' . $value;
         } else {
             $this->query->pushParam($value);
@@ -199,23 +199,13 @@ class SqlBuilder extends Component
     }
 
 
-    /**
-     * @param string $value
-     * @return bool
-     */
-    private function isMath(string $value): bool
-    {
-        return str_starts_with($value, '+ ') || str_starts_with($value, '- ');
-    }
-
-
     /**
      * @return string
      * @throws
      */
     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 +215,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 +267,12 @@ class SqlBuilder extends Component
      */
     private function makeSelect(array $select = ['*']): string
     {
-        $select = "SELECT " . implode(',', $select) . " FROM " . $this->query->from;
+        $select = "SELECT " . implode(',', $select) . " FROM " . $this->query->getFrom();
-        if ($this->query->alias != "") {
+        if ($this->query->getAlias() != "") {
-            $select .= " AS " . $this->query->alias;
+            $select .= " AS " . $this->query->getAlias();
         }
-        if (count($this->query->join) > 0) {
+        if (count($this->query->getJoin()) > 0) {
-            $select .= ' ' . implode(' ', $this->query->join);
+            $select .= ' ' . implode(' ', $this->query->getJoin());
         }
         return $select;
     }
@@ -293,8 +283,8 @@ class SqlBuilder extends Component
      */
     private function makeGroup(): string
     {
-        if ($this->query->group != "") {
+        if ($this->query->getGroup() != "") {
-            return ' GROUP BY ' . $this->query->group;
+            return ' GROUP BY ' . $this->query->getGroup();
         }
         return '';
     }
@@ -305,8 +295,8 @@ class SqlBuilder extends Component
      */
     private function makeOrder(): string
     {
-        if (count($this->query->order) > 0) {
+        if (count($this->query->getOrder()) > 0) {
-            return ' ORDER BY ' . implode(',', $this->query->order);
+            return ' ORDER BY ' . implode(',', $this->query->getOrder());
         }
         return '';
     }
@@ -317,7 +307,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 +317,8 @@ class SqlBuilder extends Component
 
     private function makeLimit(): string
     {
-        if ($this->query->offset >= 0 && $this->query->limit >= 1) {
+        if ($this->query->getOffset() >= 0 && $this->query->getLimit() >= 1) {
-            return ' LIMIT ' . $this->query->offset . ',' . $this->query->limit;
+            return ' LIMIT ' . $this->query->getOffset() . ',' . $this->query->getLimit();
         }
         return '';
     }
@@ -354,7 +344,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);
+            $query    = di(Relation::class)->getQuery($this->name);
-            $relation->getQuery($this->name)->$name(...$arguments);
+            if (is_null($query)) {
+                throw new \Exception('Unknown relation key: ' . $this->name);
+            }
+            $query->$name(...$arguments);
             return $this;
         } else {
             return $this->get();

test.php

@@ -0,0 +1,23 @@
+<?php
+
+
+use Database\Query;
+
+class Users extends \Database\Model
+{
+
+
+	public function hasD()
+	{
+		return $this->hasOne(static::class, 'id', 'id')->with([]);
+	}
+}
+
+Users::query()
+	->select(['*', (new Query(Users::class))
+		->where(['id' => 2])])
+	->from(function (Query $query) {
+		$query->from(Users::class)
+			->where(['id' => 1])
+			->groupBy('name DESC');
+	})->toSql();