eee

ActiveQuery.php

@@ -22,208 +22,272 @@ class ActiveQuery extends QueryTrait implements ISqlBuilder
 {
 
 
-    public bool     $asArray = FALSE;
-    protected mixed $_mock   = null;
+	public bool     $asArray = FALSE;
+	protected mixed $_mock   = NULL;
 
 
-    /**
-     * @param bool $asArray
-     * @return static
-     */
-    public function asArray(bool $asArray = true): static
-    {
-        $this->asArray = $asArray;
-        return $this;
-    }
+	/**
+	 * @param bool $asArray
+	 *
+	 * @return static
+	 */
+	public function asArray(bool $asArray = TRUE): static
+	{
+		$this->asArray = $asArray;
+		return $this;
+	}
 
-    /**
-     * @param array $methods
-     * @return $this
-     */
-    public function with(array $methods): static
-    {
-        $this->modelClass->setWith($methods);
-        return $this;
-    }
+	/**
+	 * @param array $methods
+	 *
+	 * @return $this
+	 */
+	public function with(array $methods): static
+	{
+		$this->modelClass->setWith($methods);
+		return $this;
+	}
 
 
-    /**
-     * @return ModelInterface|array|null|bool
-     * @throws
-     */
-    public function first(): ModelInterface|null|array|bool
-    {
-        $data = $this->buildCommand($this->builder->one())->one();
-        if (is_array($data)) {
-            return $this->populate($data);
-        }
-        return null;
-    }
+	/**
+	 * @return ModelInterface|array|null|bool
+	 * @throws
+	 */
+	public function first(): ModelInterface|null|array|bool
+	{
+		$data = $this->buildCommand($this->builder->one())->one();
+		if (is_array($data)) {
+			return $this->populate($data);
+		}
+		return NULL;
+	}
 
-    /**
-     * @return bool|Collection
-     */
-    public function get(): bool|Collection
-    {
-        $data = $this->buildCommand($this->builder->all())->all();
-        if (is_array($data)) {
-            return new Collection($this, $this->modelClass, $data);
-        }
-        return false;
-    }
+	/**
+	 * @return bool|Collection
+	 */
+	public function get(): bool|Collection
+	{
+		$data = $this->buildCommand($this->builder->all())->all();
+		if (is_array($data)) {
+			return new Collection($this, $this->modelClass, $data);
+		}
+		return FALSE;
+	}
 
 
-    /**
-     * @throws
-     */
-    public function flush(): bool
-    {
-        return (bool)$this->buildCommand($this->builder->truncate())->exec();
-    }
+	/**
+	 * @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 int $size
-     * @param Closure $closure
-     * @return void
-     */
-    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 $attributes
+	 *
+	 * @return bool
+	 */
+	public function increments(array $attributes): bool
+	{
+		return (bool)$this->buildCommand($this->builder->mathematics($attributes))->exec();
+	}
 
 
-    /**
-     * @param mixed $value
-     * @return $this
-     */
-    public function withMock(mixed $value): static
-    {
-        $this->_mock = $value;
-        return $this;
-    }
+	/**
+	 * @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();
+	}
 
 
-    /**
-     * @return mixed
-     */
-    public function mock(): mixed
-    {
-        return $this->_mock;
-    }
+	/**
+	 * @param array $attributes
+	 *
+	 * @return bool
+	 */
+	public function decrements(array $attributes): bool
+	{
+		return (bool)$this->buildCommand($this->builder->mathematics($attributes, '-'))->exec();
+	}
 
 
-    /**
-     * @param array $data
-     * @return ModelInterface|array
-     * @throws
-     */
-    public function populate(array $data): ModelInterface|array
-    {
-        $model = $this->modelClass->populates($data);
-
-        return $this->asArray ? $model->toArray() : $model;
-    }
+	/**
+	 * @throws
+	 */
+	public function flush(): bool
+	{
+		return (bool)$this->buildCommand($this->builder->truncate())->exec();
+	}
 
 
-    /**
-     * @return int
-     * @throws
-     */
-    public function count(): int
-    {
-        return $this->buildCommand($this->builder->count())->rowCount();
-    }
+	/**
+	 * @param int     $size
+	 * @param Closure $closure
+	 *
+	 * @return void
+	 */
+	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
-     * @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 mixed $value
+	 *
+	 * @return $this
+	 */
+	public function withMock(mixed $value): static
+	{
+		$this->_mock = $value;
+		return $this;
+	}
 
 
-    /**
-     * @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 mixed
+	 */
+	public function mock(): mixed
+	{
+		return $this->_mock;
+	}
 
 
-    /**
-     * @return bool
-     */
-    public function delete(): bool
-    {
-        return $this->buildCommand($this->builder->delete())->delete();
-    }
+	/**
+	 * @param array $data
+	 *
+	 * @return ModelInterface|array
+	 * @throws
+	 */
+	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();
+	}
 }

Base/Model.php

@@ -23,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;
@@ -62,7 +63,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
     /**
      * @var bool
      */
-    protected bool $skipValidate = false;
+    protected bool $skipValidate = FALSE;
 
 
     /**
@@ -105,6 +106,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
 
     /**
      * @param array $data
+     *
      * @return Model
      */
     public function setWith(array $data): static
@@ -163,6 +165,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
 
     /**
      * @param bool $bool
+     *
      * @return $this
      */
     public function setIsNowExample(bool $bool = FALSE): static
@@ -211,9 +214,9 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
     public function hasPrimaryValue(): bool
     {
         if ($this->hasPrimary()) {
-            return $this->getPrimaryValue() === null;
+            return $this->getPrimaryValue() === NULL;
         }
-        return false;
+        return FALSE;
     }
 
 
@@ -223,41 +226,44 @@ 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;
+            return NULL;
         }
     }
 
     /**
      * @param int|string|array $param
+     *
      * @return Model|null
      * @throws
      */
     public static function findOne(int|string|array|null $param): ?static
     {
-        if (empty($param)) return null;
-        $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;
     }
 
 
     /**
      * @param int $param
+     *
      * @return Model|null
      * @throws
      */
@@ -291,6 +297,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
 
     /**
      * @param int|string|array $condition
+     *
      * @return static|null
      * @throws
      */
@@ -302,6 +309,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
 
     /**
      * @param string|array $condition
+     *
      * @return Collection
      * @throws
      */
@@ -325,7 +333,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
     public static function query(): ActiveQuery
     {
         $model = new ActiveQuery(static::instance());
-        $model->from($model->getTable())->alias('t1');
+        $model->select()->from($model->getTable())->alias('t1');
         return $model;
     }
 
@@ -379,6 +387,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
     /**
      * @param string $name
      * @param mixed $value
+     *
      * @return mixed
      */
     public function setAttribute(string $name, mixed $value): mixed
@@ -393,6 +402,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
     /**
      * @param string $name
      * @param mixed $value
+     *
      * @return mixed
      */
     public function setOldAttribute(string $name, mixed $value): mixed
@@ -406,6 +416,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
 
     /**
      * @param array $param
+     *
      * @return $this
      * @throws
      */
@@ -420,6 +431,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
 
     /**
      * @param array $param
+     *
      * @return $this
      */
     public function setOldAttributes(array $param): static
@@ -439,13 +451,16 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
     {
         $sql    = SqlBuilder::builder($query = static::query())->insert($this->_attributes);
         $lastId = $this->getConnection()->createCommand($sql, $query->params)->exec();
-        if ($lastId === false) {
-            return false;
+        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]);
     }
 
 
@@ -453,6 +468,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
      * @param array $old
      * @param array $condition
      * @param array $change
+     *
      * @return $this|bool
      * @throws
      */
@@ -460,11 +476,11 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
     {
         $query = static::query()->where($condition);
         if (count($change) < 1) {
-            return true;
+            return TRUE;
         }
         $generate = SqlBuilder::builder($query)->update($change);
-        if ($generate === false) {
-            return false;
+        if ($generate === FALSE) {
+            return FALSE;
         }
         if (!$this->getConnection()->createCommand($generate, $query->params)->exec()) {
             return FALSE;
@@ -526,6 +542,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
 
     /**
      * @param array $value
+     *
      * @return $this
      */
     public function populates(array $value): static
@@ -539,6 +556,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
 
     /**
      * @param array $rule
+     *
      * @return bool
      * @throws
      */
@@ -558,6 +576,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
 
     /**
      * @param array $rule
+     *
      * @return Validator
      * @throws
      */
@@ -578,6 +597,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
 
     /**
      * @param string $name
+     *
      * @return null
      * @throws
      */
@@ -593,18 +613,19 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
      */
     public function getRelation(): ?Relation
     {
-        return Kiri::getDi()->get(Relation::class);
+        return di(Relation::class);
     }
 
 
     /**
      * @param string $attribute
+     *
      * @return bool
      * @throws
      */
     public function has(string $attribute): bool
     {
-        return true;
+        return TRUE;
     }
 
 
@@ -630,6 +651,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
     /**
      * @param array $oldAttributes
      * @param array $changeAttributes
+     *
      * @return bool
      */
     public function afterSave(array $oldAttributes, array $changeAttributes): bool
@@ -640,6 +662,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
 
     /**
      * @param self $model
+     *
      * @return bool
      * @throws
      */
@@ -655,6 +678,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
     public function refresh(): static
     {
         $this->_oldAttributes = $this->_attributes;
+        $this->isNewExample   = FALSE;
         return $this;
     }
 
@@ -662,17 +686,21 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
     /**
      * @param string $name
      * @param mixed $value
+     *
      * @return void
      */
     public function __set(string $name, mixed $value): void
     {
-        if ($this->hasRelateMethod($name, 'set')) {
-            $this->{'set' . ucfirst($name)}($value);
+        $prefix = 'set' . ucfirst($name);
+        if (method_exists($this, $prefix)) {
+            $this->{$prefix}($value);
+            return;
+        }
+
+        $method = $prefix . 'Attribute';
+        if (method_exists($this, $method)) {
+            $this->_attributes[$name] = $this->{$method}($value);
         } else {
-            $method = 'set' . ucfirst($name) . 'Attribute';
-            if (method_exists($this, $method)) {
-                $value = $this->{$method} ($value);
-            }
             $this->_attributes[$name] = $value;
         }
     }
@@ -680,12 +708,13 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
 
     /**
      * @param string $name
+     *
      * @return mixed
      */
     public function __get(string $name): mixed
     {
-        $value = $this->_attributes[$name] ?? null;
-        if (!$this->hasRelateMethod($name)) {
+        $value = $this->_attributes[$name] ?? NULL;
+        if (!method_exists($this, 'get' . ucfirst($name))) {
             return $this->withPropertyOverride($name, $value);
         } else {
             return $this->withRelate($name);
@@ -696,9 +725,10 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
     /**
      * @param string $name
      * @param mixed|null $value
+     *
      * @return mixed
      */
-    protected function withPropertyOverride(string $name, mixed $value = null): mixed
+    protected function withPropertyOverride(string $name, mixed $value = NULL): mixed
     {
         $method = 'get' . ucfirst($name) . 'Attribute';
         if (method_exists($this, $method)) {
@@ -712,16 +742,26 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
     /**
      * @param string $name
      * @param string $prefix
+     *
      * @return bool
      */
-    protected function hasRelateMethod(string $name, string $prefix = 'get'): bool
+    protected function hasRelateMethod(string $name): bool
     {
-        return method_exists($this, $prefix . ucfirst($name));
+        $reflection = $this->container->get(static::class);
+        if (!$reflection->hasMethod($name)) {
+            return FALSE;
+        }
+        if ($reflection->getMethod($name)->isStatic() || !$reflection->getMethod($name)->isPublic()) {
+            return FALSE;
+        } else {
+            return TRUE;
+        }
     }
 
 
     /**
      * @param string $name
+     *
      * @return mixed
      */
     protected function withRelate(string $name): mixed
@@ -736,6 +776,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
 
     /**
      * @param $name
+     *
      * @return bool
      */
     public function __isset(string $name): bool
@@ -746,6 +787,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
 
     /**
      * @param mixed $offset
+     *
      * @return bool
      * @throws
      */
@@ -756,6 +798,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
 
     /**
      * @param mixed $offset
+     *
      * @return mixed
      * @throws
      */
@@ -767,18 +810,22 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
     /**
      * @param mixed $offset
      * @param mixed $value
+     *
      * @throws
      */
-    #[ReturnTypeWillChange] public function offsetSet(mixed $offset, mixed $value): void
+    #[ReturnTypeWillChange]
+    public function offsetSet(mixed $offset, mixed $value): void
     {
         $this->__set($offset, $value);
     }
 
     /**
      * @param mixed $offset
+     *
      * @throws
      */
-    #[ReturnTypeWillChange] public function offsetUnset(mixed $offset): void
+    #[ReturnTypeWillChange]
+    public function offsetUnset(mixed $offset): void
     {
         if (!isset($this->_attributes[$offset]) && !isset($this->_oldAttributes[$offset])) {
             return;
@@ -789,6 +836,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
 
     /**
      * @param string ...$params
+     *
      * @return array
      */
     public function unset(string ...$params): array
@@ -799,6 +847,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
 
     /**
      * @param array $data
+     *
      * @return static
      * @throws
      */
@@ -815,6 +864,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
     /**
      * @param string $name
      * @param array $arguments
+     *
      * @return mixed
      */
     public static function __callStatic(string $name, array $arguments)
@@ -825,11 +875,12 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
 
     /**
      * @param string $field
+     *
      * @return array
      */
     public function getOldAttribute(string $field): mixed
     {
-        return $this->_oldAttributes[$field] ?? null;
+        return $this->_oldAttributes[$field] ?? NULL;
     }
 
 }

Command.php

@@ -109,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]);
             }
@@ -118,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) {
@@ -151,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]);
             }
@@ -161,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));
         }

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

@@ -1,4 +1,5 @@
-<?php /** @noinspection ALL */
+<?php
+/** @noinspection ALL */
 
 declare(strict_types=1);
 
@@ -189,7 +190,7 @@ class SqlBuilder extends Component
         if (is_null($value)) {
             return $keys;
         }
-        if (is_string($value) && $this->isMath($value)) {
+        if (preg_match('/^[+|-]\s\d+$/', (string)$value)) {
             $keys[] = $key . '=' . $key . ' ' . $value;
         } else {
             $this->query->pushParam($value);
@@ -199,23 +200,14 @@ 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->getSelect()) . $this->make() . $this->makeLimit($this->query->limit(1));
+        $this->query->offset(0)->limit(1);
+        return $this->makeSelect($this->query->getSelect()) . $this->make() . $this->makeLimit();
     }
 
 
@@ -225,7 +217,7 @@ class SqlBuilder extends Component
      */
     public function all(): string
     {
-        return $this->makeSelect($this->query->getSelect()) . $this->make() . $this->makeLimit($this->query);
+        return $this->makeSelect($this->query->getSelect()) . $this->make() . $this->makeLimit();
     }
 
 

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

@@ -28,19 +28,19 @@ use Kiri\Abstracts\Component;
 abstract class QueryTrait extends Component implements ActiveQueryInterface, ISqlBuilder
 {
     protected array      $where  = [];
-    protected array      $select = ['*'];
+    protected array      $select = ['t1.*'];
     protected array      $join   = [];
     protected array      $order  = [];
     protected int        $offset = -1;
     protected int        $limit  = -1;
     protected string     $group  = '';
     protected string     $from   = '';
-    protected string     $alias  = 't1';
+    protected string     $alias  = '';
     protected array      $filter = [];
-    protected bool       $lock   = false;
+    protected bool       $lock   = FALSE;
     protected SqlBuilder $builder;
     protected array      $params = [];
-    protected array      $_alias = ['t1'];
+    protected array      $_alias = [];
 
 
     /**
@@ -53,7 +53,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
      * Comply constructor.
      * @throws
      */
-    public function __construct($model = null)
+    public function __construct($model = NULL)
     {
         if (!is_null($model)) {
             $this->modelClass = $model;
@@ -65,6 +65,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 
     /**
      * @param array $where
+     *
      * @return void
      */
     public function setWhere(array $where): void
@@ -73,8 +74,51 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
     }
 
 
+    /**
+     * @param Closure|Query $callback
+     * @param array $attributes
+     *
+     * @return $this
+     */
+    public function whereNotExists(Closure|Query $callback, array $attributes = []): static
+    {
+        if ($callback instanceof Query) {
+            $this->where[] = 'NOT EXISTS(' . $callback->build() . ')';
+            $this->mergeParams($callback->getParams());
+        } else {
+            $this->where[] = 'NOT EXISTS(' . $this->makeClosureFunction($callback) . ')';
+        }
+        if (count($attributes) > 0) {
+            $this->bindParams($attributes);
+        }
+        return $this;
+    }
+
+
+    /**
+     * @param Closure|Query $callback
+     * @param array $attributes
+     *
+     * @return $this
+     */
+    public function whereExists(Closure|Query $callback, array $attributes = []): static
+    {
+        if ($callback instanceof Query) {
+            $this->where[] = 'EXISTS(' . $callback->build() . ')';
+            $this->mergeParams($callback->getParams());
+        } else {
+            $this->where[] = 'EXISTS(' . $this->makeClosureFunction($callback) . ')';
+        }
+        if (count($attributes) > 0) {
+            $this->bindParams($attributes);
+        }
+        return $this;
+    }
+
+
     /**
      * @param array $select
+     *
      * @return void
      */
     public function setSelect(array $select): void
@@ -85,6 +129,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 
     /**
      * @param array $join
+     *
      * @return void
      */
     public function setJoin(array $join): void
@@ -95,6 +140,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 
     /**
      * @param array $order
+     *
      * @return void
      */
     public function setOrder(array $order): void
@@ -105,6 +151,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 
     /**
      * @param int $offset
+     *
      * @return void
      */
     public function setOffset(int $offset): void
@@ -115,6 +162,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 
     /**
      * @param int $limit
+     *
      * @return void
      */
     public function setLimit(int $limit): void
@@ -125,6 +173,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 
     /**
      * @param string $group
+     *
      * @return void
      */
     public function setGroup(string $group): void
@@ -135,6 +184,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 
     /**
      * @param string $from
+     *
      * @return void
      */
     public function setFrom(string $from): void
@@ -145,6 +195,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 
     /**
      * @param string $alias
+     *
      * @return void
      */
     public function setAlias(string $alias): void
@@ -154,6 +205,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 
     /**
      * @param array $params
+     *
      * @return void
      */
     public function setParams(array $params): void
@@ -252,9 +304,22 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
     }
 
 
+    /**
+     * @param array $params
+     * @return void
+     */
+    public function mergeParams(array $params): void
+    {
+        foreach ($params as $key => $value) {
+            $this->pushParam($value);
+        }
+    }
+
+
     /**
      * @param string $column
      * @param callable $callable
+     *
      * @return $this
      */
     public function when(string $column, callable $callable): static
@@ -271,6 +336,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 
     /**
      * @param bool $lock
+     *
      * @return $this
      */
     public function lock(bool $lock): static
@@ -282,6 +348,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 
     /**
      * @param string $whereRaw
+     *
      * @return QueryTrait
      */
     public function whereRaw(string $whereRaw): static
@@ -307,6 +374,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
     /**
      * @param string $column
      * @param string $value
+     *
      * @return $this
      */
     public function whereLocate(string $column, string $value): static
@@ -318,6 +386,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 
     /**
      * @param string $column
+     *
      * @return $this
      */
     public function whereNull(string $column): static
@@ -329,6 +398,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 
     /**
      * @param string $column
+     *
      * @return $this
      */
     public function whereEmpty(string $column): static
@@ -340,6 +410,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 
     /**
      * @param string $column
+     *
      * @return $this
      */
     public function whereNotEmpty(string $column): static
@@ -351,6 +422,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 
     /**
      * @param string $column
+     *
      * @return $this
      */
     public function whereNotNull(string $column): static
@@ -376,16 +448,22 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 
 
     /**
-     * @param string|Closure $tableName
+     * @param string|Closure|Query $tableName
      *
      * @return $this
      */
-    public function from(string|Closure $tableName): static
+    public function from(string|Closure|Query $tableName): static
     {
-        if ($tableName instanceof Closure) {
-            $tableName = call_user_func($tableName, $this->queryInstance());
+        if ($tableName instanceof Query) {
+            $this->from = '(' . $tableName->build() . ')';
+            $this->mergeParams($tableName->getParams());
+        } else if ($tableName instanceof Closure) {
+            $this->from = '(' . $this->makeClosureFunction($tableName) . ')';
+        } else if (class_exists($tableName)) {
+            $this->from = (new $tableName)->getTable();
+        } else {
+            $this->from = $tableName;
         }
-        $this->from = $tableName;
         return $this;
     }
 
@@ -395,6 +473,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
      * @param string $alias
      * @param array $on
      * @param array $param
+     *
      * @return $this
      * $query->join([$tableName, ['userId'=>'uuvOd']], $param)
      * $query->join([$tableName, ['userId'=>'uuvOd'], $param])
@@ -425,6 +504,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 
     /**
      * @param array $params
+     *
      * @return void
      */
     public function bindParams(array $params): void
@@ -437,6 +517,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 
     /**
      * @param array $condition
+     *
      * @return string
      */
     private function onCondition(array $condition): string
@@ -456,16 +537,17 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 
     /**
      * @param string $value
+     *
      * @return bool
      */
     private function isAliasField(string $value): bool
     {
         foreach ($this->_alias as $alias) {
             if (str_starts_with($value, $alias . '.')) {
-                return true;
+                return TRUE;
             }
         }
-        return false;
+        return FALSE;
     }
 
 
@@ -474,6 +556,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
      * @param string $alias
      * @param array $onCondition
      * @param array $param
+     *
      * @return $this
      * @throws Exception
      */
@@ -495,6 +578,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
      * @param string $alias
      * @param array $onCondition
      * @param array $param
+     *
      * @return $this
      * @throws Exception
      */
@@ -516,6 +600,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
      * @param string $alias
      * @param array $onCondition
      * @param array $param
+     *
      * @return $this
      * @throws Exception
      */
@@ -546,6 +631,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 
     /**
      * @param string $field
+     *
      * @return $this
      */
     public function max(string $field): static
@@ -643,10 +729,11 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
      * @param array|Closure|string $conditionArray
      * @param string $opera
      * @param null $value
+     *
      * @return QueryTrait
      * @throws
      */
-    public function whereOr(array|Closure|string $conditionArray = [], string $opera = '=', $value = null): static
+    public function whereOr(array|Closure|string $conditionArray = [], string $opera = '=', $value = NULL): static
     {
         if ($conditionArray instanceof Closure) {
             $conditionArray = $this->makeClosureFunction($conditionArray);
@@ -666,6 +753,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
     /**
      * @param string $column
      * @param string $value
+     *
      * @return $this
      */
     public function whereLike(string $column, string $value): static
@@ -679,6 +767,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
     /**
      * @param string $column
      * @param string $value
+     *
      * @return $this
      */
     public function whereLeftLike(string $column, string $value): static
@@ -692,6 +781,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
     /**
      * @param string $column
      * @param string $value
+     *
      * @return $this
      */
     public function whereRightLike(string $column, string $value): static
@@ -705,6 +795,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
     /**
      * @param string $column
      * @param string $value
+     *
      * @return $this
      */
     public function whereNotLike(string $column, string $value): static
@@ -717,19 +808,23 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 
     /**
      * @param string $columns
-     * @param array|Closure $value
+     * @param array|Closure|Query $value
+     *
      * @return $this
-     * @throws
+     * @throws Exception
      */
-    public function whereIn(string $columns, array|Closure $value): static
+    public function whereIn(string $columns, array|Closure|Query $value): static
     {
-        if ($value instanceof Closure) {
-            $value = $this->makeClosureFunction($value);
+        if (is_array($value)) {
+            if (count($value) < 1) throw new Exception('Value must be an not empty array');
+
+            $this->where[] = $columns . ' IN (' . implode(',', $value) . ')';
+        } else if ($value instanceof Query) {
+            $this->where[] = $columns . ' IN (' . $value->build() . ')';
+            $this->mergeParams($value->getParams());
+        } else {
+            $this->where[] = $columns . ' IN (' . $this->makeClosureFunction($value) . ')';
         }
-        if (count($value) < 1) {
-            $value = [-1];
-        }
-        $this->where[] = $columns . ' IN (' . implode(',', $value) . ')';
         return $this;
     }
 
@@ -747,6 +842,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
     /**
      * @param string $columns
      * @param array $value
+     *
      * @return $this
      */
     public function whereNotIn(string $columns, array $value): static
@@ -763,6 +859,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
      * @param string $column
      * @param int|float $start
      * @param int|float $end
+     *
      * @return $this
      */
     public function whereBetween(string $column, int|float $start, int|float $end): static
@@ -783,6 +880,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
      * @param string $column
      * @param int|float $start
      * @param int|float $end
+     *
      * @return $this
      */
     public function whereNotBetween(string $column, int|float $start, int|float $end): static
@@ -801,6 +899,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 
     /**
      * @param mixed $value
+     *
      * @return $this
      */
     public function pushParam(mixed $value): static
@@ -813,9 +912,10 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
     /**
      * @param array|string $column
      * @param mixed $value
+     *
      * @return $this
      */
-    public function where(array|string $column, mixed $value = null): static
+    public function where(array|string $column, mixed $value = NULL): static
     {
         if (func_num_args() === 2) {
             return $this->addArray([$column => $value]);
@@ -832,6 +932,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
      * @param string $column
      * @param string $opera
      * @param mixed $value
+     *
      * @return $this
      */
     public function whereMath(string $column, string $opera, mixed $value): static
@@ -844,6 +945,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 
     /**
      * @param Closure $closure
+     *
      * @return $this
      */
     public function whereClosure(Closure $closure): static
@@ -855,6 +957,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 
     /**
      * @param Closure|array $closure
+     *
      * @return string
      * @throws
      */
@@ -866,6 +969,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
         } else {
             $generate->addArray($closure);
         }
+        $this->mergeParams($generate->getParams());
         return $generate->build();
     }
 
@@ -901,6 +1005,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 
     /**
      * @param int $offset
+     *
      * @return $this
      */
     public function offset(int $offset): static
@@ -929,12 +1034,13 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 
     /**
      * @param array $array
+     *
      * @return $this
      */
     private function addArray(array $array): static
     {
         foreach ($array as $key => $value) {
-            if ($value === null) {
+            if ($value === NULL) {
                 continue;
             }
             $this->where[] = is_numeric($key) ? $value : $this->sprintf($key, $value);
@@ -947,10 +1053,17 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
      * @param string $column
      * @param mixed $value
      * @param string $opera
+     *
      * @return string
      */
     private function sprintf(string $column, mixed $value, string $opera = '='): string
     {
+        if (is_string($value)) {
+            [$alias, $field] = explode('.', $value);
+            if (in_array($alias, $this->_alias)) {
+                return $column . ' ' . $opera . ' ' . $value;
+            }
+        }
         $this->pushParam($value);
         return $column . ' ' . $opera . ' ?';
     }
@@ -959,6 +1072,7 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
     /**
      * @param string $querySql
      * @param array $params
+     *
      * @return Command
      */
     public function buildCommand(string $querySql, array $params = []): Command

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();