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;

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

@@ -88,9 +88,32 @@ class Command extends Component
      * @return mixed
      * @throws
      */
-    public function rowCount(): int
+    public function rowCount(): mixed
     {
-        return $this->search('rowCount');
+        $client = $this->connection->getConnection();
+        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);
+
+            $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);
+        }
     }
 
 
@@ -126,6 +149,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);
@@ -157,6 +182,7 @@ class Command extends Component
     {
         $client = $this->connection->getConnection();
         try {
+            $this->connection->println($this->sql, $this->params);
             if (($prepare = $client->prepare($this->sql)) === false) {
                 throw new Exception('(' . $prepare->errorInfo()[0] . ')' . $prepare->errorInfo()[2]);
             }
@@ -167,6 +193,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,7 @@ use Kiri\Server\Events\OnTaskerStart;
 use Kiri\Server\Events\OnAfterRequest;
 use Kiri\Di\Inject\Container;
 use Swoole\Timer;
+use Database\Base\PDO;
 
 /**
  * Class Connection
@@ -37,24 +37,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 +71,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);
+        }
     }
 
 
@@ -319,14 +336,14 @@ class Connection extends Component
      */
     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);

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