eee

ActiveQuery.php

@@ -89,6 +89,7 @@ class ActiveQuery extends QueryTrait implements ISqlBuilder
      */
     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;
@@ -203,7 +204,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

@@ -476,7 +476,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
      */
     public function save(): static|bool
     {
-        if (!$this->validator($this->rules()) || !$this->beforeSave($this)) {
+        if (!$this->validator($this->rules(), $this->_attributes) || !$this->beforeSave($this)) {
             return FALSE;
         }
         if (!$this->isNewExample) {
@@ -503,6 +503,9 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
                 $oldPrams[$key] = $this->_oldAttributes[$key];
             }
         }
+        if ($this->hasPrimary()) {
+            $condition = [$this->getPrimary() => $this->getPrimaryValue()];
+        }
         return [$oldPrams, $condition, $params];
     }
 
@@ -537,13 +540,13 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
      * @return bool
      * @throws
      */
-    public function validator(array $rule): bool
+    public function validator(array $rule, array $params): bool
     {
         if (count($rule) < 1 || $this->skipValidate) {
             return TRUE;
         }
         $validate = $this->resolve($rule);
-        if (!$validate->validation($this)) {
+        if (!$validate->validation($params)) {
             return \Kiri::getLogger()->failure($validate->getError() . PHP_EOL, 'mysql');
         } else {
             return TRUE;

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

@@ -75,6 +75,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
@@ -90,21 +103,9 @@ class Command extends Component
      */
     public function rowCount(): int
     {
-        return $this->search('rowCount');
+        $data = $this->search('fetch');
-    }
 
-
+        return !$data ? 0 : +current($data);
-    /**
-     * @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;
     }
 
 
@@ -126,6 +127,8 @@ class Command extends Component
             $result = $method == 'rowCount' ? $prepare->rowCount() : $prepare->{$method}(PDO::FETCH_ASSOC);
             $prepare->closeCursor();
 
+            $this->connection->println($this->sql, $this->params);
+
             return $result;
         } catch (Throwable $throwable) {
             if ($this->isRefresh($throwable)) return $this->search($method);
@@ -167,6 +170,8 @@ class Command extends Component
 
             $result = $client->lastInsertId();
 
+            $this->connection->println($this->sql, $this->params);
+
             return $result == 0 ? $prepare->rowCount() : (int)$result;
         } catch (Throwable $throwable) {
             if ($this->isRefresh($throwable)) return $this->_prepare();

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,24 +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  = [];
+    public array        $slave       = [];
+    protected ?\Closure $_println    = null;
 
 
     /**
@@ -69,6 +73,21 @@ class Connection extends Component
     public function __construct(public Pool $connections)
     {
         parent::__construct();
+
+        $this->_println = \config('databases.logger', null);
+    }
+
+
+    /**
+     * @param string $sql
+     * @param array $params
+     * @return void
+     */
+    public function println(string $sql, array $params = []): void
+    {
+        if (is_callable($this->_println)) {
+            call_user_func($this->_println, $sql, $params);
+        }
     }
 
 
@@ -105,14 +124,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]);
@@ -122,6 +141,15 @@ class Connection extends Component
     }
 
 
+    /**
+     * @return string
+     */
+    private function getName(): string
+    {
+        return 'mysql.' . $this->cds;
+    }
+
+
     /**
      * @param Pool $pool
      * @return PDO|bool
@@ -130,7 +158,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) {
@@ -160,7 +188,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.');
         }
@@ -286,7 +314,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);
         }
     }
 
@@ -298,7 +326,7 @@ class Connection extends Component
      */
     public function clear_connection(): void
     {
-        $this->pool()->flush($this->cds, 0);
+        $this->pool()->flush($this->getName(), 0);
     }
 
 
@@ -310,23 +338,24 @@ 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 = new \PDO('mysql:dbname=' . $this->database . ';host=' . $this->cds, $this->username, $this->password, [
-            PDO::ATTR_ERRMODE            => PDO::ERRMODE_EXCEPTION,
+            \PDO::ATTR_CASE               => \PDO::CASE_NATURAL,
-            PDO::ATTR_ORACLE_NULLS       => PDO::NULL_NATURAL,
+            \PDO::ATTR_ERRMODE            => \PDO::ERRMODE_EXCEPTION,
-            PDO::ATTR_STRINGIFY_FETCHES  => false,
+            \PDO::ATTR_ORACLE_NULLS       => \PDO::NULL_NATURAL,
-            PDO::ATTR_EMULATE_PREPARES   => true,
+            \PDO::ATTR_STRINGIFY_FETCHES  => false,
-            PDO::ATTR_TIMEOUT            => $this->timeout,
+            \PDO::ATTR_EMULATE_PREPARES   => true,
-            PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES ' . $this->charset
+            \PDO::ATTR_TIMEOUT            => $this->timeout,
+            \PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES ' . $this->charset
         ]);
         foreach ($this->attributes as $key => $attribute) {
             $pdo->setAttribute($key, $attribute);
@@ -340,8 +369,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

Model.php

@@ -191,7 +191,7 @@ class Model extends Base\Model
      */
     public function update(array $params): static|bool
     {
-        if (!$this->validator($this->rules()) || !$this->beforeSave($this)) {
+        if (!$this->validator($this->rules(), $params) || !$this->beforeSave($this)) {
             return FALSE;
         }
         return $this->updateInternal(...$this->arrayIntersect($params));

SqlBuilder.php

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

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,20 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
     }
 
 
+    /**
+     * @param string $name
+     * @return mixed
+     * @throws Exception
+     */
+    public function __get(string $name)
+    {
+        if (property_exists($this, $name)) {
+            return $this->$name;
+        }
+        return parent::__get($name); // TODO: Change the autogenerated stub
+    }
+
+
     /**
      * @param string $column
      * @param callable $callable
@@ -623,10 +637,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 {