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);
         }
@@ -204,7 +246,7 @@ class ActiveQuery extends QueryTrait implements ISqlBuilder
      */
     public function exists(): bool
     {
-        return $this->buildCommand($this->builder->one())->rowCount() > 0;
+        return $this->buildCommand($this->limit(1)->builder->exists())->exists();
     }
 
 

Base/ActiveQueryInterface.php

@@ -221,10 +221,11 @@ interface ActiveQueryInterface
     public function whereNotBetween(string $column, int|float $start, int|float $end): QueryTrait;
 
     /**
-     * @param array $column
+     * @param array|string $column
+     * @param mixed|null $value
      * @return QueryTrait
      */
-    public function where(array $column): QueryTrait;
+    public function where(array|string $column, mixed $value = null): QueryTrait;
 
 
     /**

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()) {
+        if ($this->hasPrimary() && isset($this->_oldAttributes[$this->getPrimary()])) {
-            return (int)$this->_oldAttributes[$this->getPrimary()] ?? null;
+            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();
+        if (empty($param)) {
-        $query = new ActiveQuery($model);
+            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 = $query->first()) === false) {
-        if ($data === 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()) {
+        if (!$this->hasPrimary()) {
-            $this->_attributes[$this->getPrimary()] = $lastId;
+            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;
     }
 

Base/PDO.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace Database\Base;
+
+class PDO extends \PDO
+{
+
+
+    /**
+     * @param string $database
+     * @param string $host
+     * @param string $username
+     * @param string $password
+     * @param array $options
+     */
+    public function __construct(
+        readonly public string $database,
+        readonly public string $host,
+        readonly public string $username,
+        readonly public string $password,
+        readonly public array  $options,
+    )
+    {
+        parent::__construct('mysql:dbname=' . $this->database . ';host=' . $this->host, $this->username, $this->password, $this->options);
+    }
+
+
+}

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
@@ -75,6 +66,19 @@ class Command extends Component
         return $this->search('fetch');
     }
 
+    /**
+     * @return bool
+     * @throws Exception
+     */
+    public function exists(): bool
+    {
+        $data = $this->search('fetch');
+        if (!$data) {
+            return false;
+        }
+        return true;
+    }
+
     /**
      * @return mixed
      * @throws
@@ -88,46 +92,11 @@ class Command extends Component
      * @return mixed
      * @throws
      */
-    public function rowCount(): mixed
+    public function rowCount(): int
     {
-        $client = $this->connection->getConnection();
+        $data = $this->search('fetch');
-        try {
-            $client->setAttribute(PDO::MYSQL_ATTR_USE_BUFFERED_QUERY, true);
-            if (($prepare = $client->query($this->sql)) === false) {
-                throw new Exception('(' . $prepare->errorInfo()[0] . ')' . $client->errorInfo()[2]);
-            }
 
-            $prepare->execute($this->params);
+        return !$data ? 0 : +current($data);
-
-            $count = $prepare->rowCount();
-            $prepare->closeCursor();
-
-            $this->connection->println($this->sql, $this->params);
-
-            return $count;
-        } catch (Throwable $throwable) {
-            if ($this->isRefresh($throwable)) return $this->rowCount();
-
-            $errorMsg = $throwable->getMessage() . PHP_EOL . '                 Sql: ' . $this->sql . '.' . json_encode($this->params);
-            $this->getLogger()->failure($errorMsg . PHP_EOL, 'mysql');
-            return 0;
-        } finally {
-            $this->connection->release($client);
-        }
-    }
-
-
-    /**
-     * @return bool
-     * @throws Exception
-     */
-    public function exists(): bool
-    {
-        $total = $this->search('rowCount');
-        if ($total === false) {
-            throw new Exception('Query data is has error.');
-        }
-        return $total > 0;
     }
 
 
@@ -140,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]);
             }
@@ -149,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) {
@@ -182,7 +152,7 @@ class Command extends Component
     {
         $client = $this->connection->getConnection();
         try {
-            $this->connection->println($this->sql, $this->params);
+            $startTime = microtime(true);
             if (($prepare = $client->prepare($this->sql)) === false) {
                 throw new Exception('(' . $prepare->errorInfo()[0] . ')' . $prepare->errorInfo()[2]);
             }
@@ -193,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

@@ -21,7 +21,6 @@ use Kiri\Abstracts\Component;
 use Kiri\Di\Context;
 use Kiri\Pool\Pool;
 use Kiri\Events\EventProvider;
-use PDO;
 use Kiri\Error\StdoutLogger;
 use Psr\Log\LoggerInterface;
 use Kiri\Server\Events\OnWorkerStart;
@@ -29,6 +28,9 @@ use Kiri\Server\Events\OnTaskerStart;
 use Kiri\Server\Events\OnAfterRequest;
 use Kiri\Di\Inject\Container;
 use Swoole\Timer;
+use Database\Base\PDO;
+
+//use PDO;
 
 /**
  * Class Connection
@@ -37,25 +39,26 @@ use Swoole\Timer;
 class Connection extends Component
 {
 
-    public string      $id          = 'db';
+    public string       $id          = 'db';
-    public string      $cds         = '';
+    public string       $cds         = '';
-    public string      $password    = '';
+    public string       $password    = '';
-    public string      $username    = '';
+    public string       $username    = '';
-    public string      $charset     = 'utf-8';
+    public string       $charset     = 'utf-8';
-    public string      $tablePrefix = '';
+    public string       $tablePrefix = '';
-    public string      $database    = '';
+    public string       $database    = '';
-    public int         $timeout     = 30;
+    public int          $timeout     = 30;
-    public int         $waite_time  = 3;
+    public int          $waite_time  = 3;
-    public int         $tick_time   = 60;
+    public int          $tick_time   = 60;
-    public int         $idle_count  = 3;
+    public int          $idle_count  = 3;
-    public int         $idle_time   = 60;
+    public int          $idle_time   = 60;
-    public array       $pool        = ['max' => 10, 'min' => 1];
+    public array        $pool        = ['max' => 10, 'min' => 1];
-    private int        $storey      = 0;
+    private int         $storey      = 0;
-    protected int      $timerId     = -1;
+    protected int       $timerId     = -1;
-    public bool        $enableCache = false;
+    public bool         $enableCache = false;
-    public string      $cacheDriver = 'redis';
+    public string       $cacheDriver = 'redis';
-    public array       $attributes  = [];
+    public array        $attributes  = [];
-    protected \Closure $_println;
+    public array        $slave       = [];
+    protected ?\Closure $_println    = null;
 
 
     /**
@@ -64,6 +67,14 @@ class Connection extends Component
     #[Container(LoggerInterface::class)]
     public StdoutLogger $logger;
 
+
+    /**
+     * @var EventProvider
+     */
+    #[Container(EventProvider::class)]
+    public EventProvider $eventProvider;
+
+
     /**
      * @param Pool $connections
      */
@@ -76,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);
         }
     }
 
@@ -94,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']);
     }
 
 
@@ -110,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()));
     }
 
 
@@ -121,14 +133,14 @@ class Connection extends Component
      */
     protected function checkClientHealth(Pool $pool): void
     {
-        $pool->flush($this->cds, $this->pool['min'] ?? 1);
+        $pool->flush($this->getName(), $this->pool['min'] ?? 1);
-        $length = $pool->size($this->cds);
+        $length = $pool->size($this->getName());
         for ($i = 0; $i < $length; $i++) {
             try {
                 if (($client = $this->validator($pool)) === false) {
                     break;
                 }
-                $pool->push($this->cds, $client);
+                $pool->push($this->getName(), $client);
             } catch (\Throwable $exception) {
                 if (!str_contains($exception->getMessage(), 'Client timeout.')) {
                     $this->logger->error(throwable($exception), [$this->cds]);
@@ -138,6 +150,15 @@ class Connection extends Component
     }
 
 
+    /**
+     * @return string
+     */
+    private function getName(): string
+    {
+        return 'mysql.' . $this->cds;
+    }
+
+
     /**
      * @param Pool $pool
      * @return PDO|bool
@@ -146,7 +167,7 @@ class Connection extends Component
     protected function validator(Pool $pool): PDO|bool
     {
         /** @var $client PDO */
-        if (($client = $pool->get($this->cds)) === false) {
+        if (($client = $pool->get($this->getName())) === false) {
             return false;
         }
         if ($client->query('select 1') === false) {
@@ -176,7 +197,7 @@ class Connection extends Component
      */
     protected function getNormalClientHealth(): PDO
     {
-        $data = $this->pool()->get($this->cds, $this->waite_time);
+        $data = $this->pool()->get($this->getName(), $this->waite_time);
         if ($data === false) {
             throw new Exception('Client Waite timeout.');
         }
@@ -302,7 +323,7 @@ class Connection extends Component
     public function release(PDO $pdo): void
     {
         if (!$this->inTransaction()) {
-            $this->pool()->push($this->cds, $pdo);
+            $this->pool()->push($this->getName(), $pdo);
         }
     }
 
@@ -314,7 +335,7 @@ class Connection extends Component
      */
     public function clear_connection(): void
     {
-        $this->pool()->flush($this->cds, 0);
+        $this->pool()->flush($this->getName(), 0);
     }
 
 
@@ -326,23 +347,23 @@ class Connection extends Component
         if ($this->timerId > -1) {
             Timer::clear($this->timerId);
         }
-        $this->pool()->close($this->cds);
+        $this->pool()->close($this->getName());
     }
 
 
     /**
      * @return PDO
      */
-    public function newConnect(): PDO
+    public function newConnect(): \PDO
     {
-        $pdo = new PDO('mysql:dbname=' . $this->database . ';host=' . $this->cds, $this->username, $this->password, [
+        $pdo = new PDO($this->database, $this->cds, $this->username, $this->password, [
-            PDO::ATTR_CASE               => PDO::CASE_NATURAL,
+            \PDO::ATTR_CASE               => \PDO::CASE_NATURAL,
-            PDO::ATTR_ERRMODE            => PDO::ERRMODE_EXCEPTION,
+            \PDO::ATTR_ERRMODE            => \PDO::ERRMODE_EXCEPTION,
-            PDO::ATTR_ORACLE_NULLS       => PDO::NULL_NATURAL,
+            \PDO::ATTR_ORACLE_NULLS       => \PDO::NULL_NATURAL,
-            PDO::ATTR_STRINGIFY_FETCHES  => false,
+            \PDO::ATTR_STRINGIFY_FETCHES  => false,
-            PDO::ATTR_EMULATE_PREPARES   => true,
+            \PDO::ATTR_EMULATE_PREPARES   => true,
-            PDO::ATTR_TIMEOUT            => $this->timeout,
+            \PDO::ATTR_TIMEOUT            => $this->timeout,
-            PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES ' . $this->charset
+            \PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES ' . $this->charset
         ]);
         foreach ($this->attributes as $key => $attribute) {
             $pdo->setAttribute($key, $attribute);
@@ -356,8 +377,8 @@ class Connection extends Component
      */
     protected function pool(): Pool
     {
-        if (!$this->connections->hasChannel($this->cds)) {
+        if (!$this->connections->hasChannel($this->getName())) {
-            $this->connections->created($this->cds, $this->pool['max'] ?? 1, [$this, 'newConnect']);
+            $this->connections->created($this->getName(), $this->pool['max'] ?? 1, [$this, 'newConnect']);
         }
         return $this->connections;
     }

Db.php

@@ -115,10 +115,11 @@ class Db extends QueryTrait implements ISqlBuilder
 
     /**
      * @return bool
+     * @throws Exception
      */
     public function exists(): bool
     {
-        return $this->connection->createCommand(SqlBuilder::builder($this)->one())->rowCount() > 0;
+        return $this->connection->createCommand(SqlBuilder::builder($this->limit(1))->exists())->exists();
     }
 
     /**
@@ -151,6 +152,55 @@ class Db extends QueryTrait implements ISqlBuilder
         return $this->connection->createCommand(SqlBuilder::builder($this)->delete())->delete();
     }
 
+
+    /**
+     * @return bool|array|null
+     */
+    public function first(): bool|array|null
+    {
+        return $this->connection->createCommand(SqlBuilder::builder($this)->one())->one();
+    }
+
+
+    /**
+     * @return bool|array
+     */
+    public function get(): bool|array
+    {
+        return $this->connection->createCommand(SqlBuilder::builder($this)->all())->all();
+    }
+
+
+    /**
+     * @param string $sql
+     * @return mixed
+     */
+    public function exec(string $sql): mixed
+    {
+        return $this->connection->createCommand($sql)->exec();
+    }
+
+
+    /**
+     * @param string $sql
+     * @return array|bool|null
+     */
+    public function query(string $sql): array|bool|null
+    {
+        return $this->connection->createCommand($sql)->one();
+    }
+
+
+    /**
+     * @param string $sql
+     * @return array|bool
+     */
+    public function queryAll(string $sql): array|bool
+    {
+        return $this->connection->createCommand($sql)->all();
+    }
+
+
     /**
      * @param string $table
      * @return array|bool|null

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();
     }
 
 
@@ -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);
     }
 
 
@@ -235,7 +235,17 @@ class SqlBuilder extends Component
      */
     public function count(): string
     {
-        return $this->makeSelect() . $this->make();
+        return $this->makeSelect(['COUNT(*)']) . $this->make();
+    }
+
+
+    /**
+     * @return string
+     * @throws
+     */
+    public function exists(): string
+    {
+        return $this->makeSelect(['0']) . $this->make();
     }
 
 
@@ -267,12 +277,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;
     }
@@ -283,8 +293,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 '';
     }
@@ -295,8 +305,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 '';
     }
@@ -307,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 '';
         }
@@ -317,8 +327,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 '';
     }
@@ -344,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);
+            $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();

Traits/QueryTrait.php

@@ -27,20 +27,20 @@ use Kiri\Abstracts\Component;
  */
 abstract class QueryTrait extends Component implements ActiveQueryInterface, ISqlBuilder
 {
-    public array         $where  = [];
+    protected array      $where  = [];
-    public array         $select = ['*'];
+    protected array      $select = ['*'];
-    public array         $join   = [];
+    protected array      $join   = [];
-    public array         $order  = [];
+    protected array      $order  = [];
-    public int           $offset = -1;
+    protected int        $offset = -1;
-    public int           $limit  = -1;
+    protected int        $limit  = -1;
-    public string        $group  = '';
+    protected string     $group  = '';
-    public string        $from   = '';
+    protected string     $from   = '';
-    public string        $alias  = 't1';
+    protected string     $alias  = 't1';
     protected array      $filter = [];
     protected bool       $lock   = false;
     protected SqlBuilder $builder;
-    public array         $params = [];
+    protected array      $params = [];
-    private array        $_alias = ['t1'];
+    protected array      $_alias = ['t1'];
 
 
     /**
@@ -63,6 +63,195 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
     }
 
 
+    /**
+     * @param array $where
+     * @return void
+     */
+    public function setWhere(array $where): void
+    {
+        $this->where = $where;
+    }
+
+
+    /**
+     * @param array $select
+     * @return void
+     */
+    public function setSelect(array $select): void
+    {
+        $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;
+    }
+
+
     /**
      * @param string $column
      * @param callable $callable
@@ -623,10 +812,14 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 
     /**
      * @param array|string $column
+     * @param mixed $value
      * @return $this
      */
-    public function where(array|string $column): static
+    public function where(array|string $column, mixed $value = null): static
     {
+        if (func_num_args() === 2) {
+            return $this->addArray([$column => $value]);
+        }
         if (is_string($column)) {
             return $this->whereRaw($column);
         } else {

test.php

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