future: support

Author: cclilshy

.github/workflows/ci.yml

@@ -19,6 +19,8 @@ jobs:
             image: 'mysql:5.7'
           - name: 'MySQL 8.0'
             image: 'mysql:8.0'
+          - name: 'MySQL 9.0'
+            image: 'mysql:9.0'
           - name: 'MariaDB 10.3'
             image: 'mariadb:10.3'
           - name: 'MariaDB 10.6'

src/Interface/StatementInterface.php

@@ -19,4 +19,9 @@ interface StatementInterface
      * @return static
      */
     public function execute(array $params = []): static;
+
+    /**
+     * @return void
+     */
+    public function close(): void;
 }

src/MySQL/Client.php

@@ -768,12 +768,12 @@ protected function sendAuthSwitchResponse(): void
      * 一次完整请求流程
      * @param string $command
      * @param string $query 要发送的数据包
-     * @param BufferInterface $heap 数据堆, 用于存储响应结果
-     * @return ResultSet 服务器响应结果
+     * @param ?BufferInterface $heap 数据堆, 用于存储响应结果
+     * @return ?ResultSet 服务器响应结果
      * @throws ConnectionException
      * @throws MySQLException
      */
-    public function request(string $command, string $query, BufferInterface $heap): ResultSet
+    public function request(string $command, string $query, ?BufferInterface $heap = null): ?ResultSet
     {
         try {
             // 获得唯一所
@@ -785,7 +785,7 @@ public function request(string $command, string $query, BufferInterface $heap):
             // 发送数据包
             $this->connection->send("{$command}{$query}");
 
-            while (1) {
+            while ($heap) {
                 try {
                     $payload = $this->connection->waitPayload();
                 } catch (Throwable $e) {
@@ -814,7 +814,7 @@ public function request(string $command, string $query, BufferInterface $heap):
                 }
             }
 
-            return new ResultSet($heap);
+            return $heap ? new ResultSet($heap) : null;
         } finally {
             $this->mutex->unlock();
         }

src/MySQL/Data/Buffer/Statement.php

@@ -36,6 +36,7 @@
 use function is_string;
 use function preg_replace_callback;
 use function is_int;
+use function pack;
 
 class Statement implements BufferInterface, StatementInterface
 {
@@ -75,14 +76,14 @@ class Statement implements BufferInterface, StatementInterface
     protected OkPacket $okPacket;
 
     /**
-     * @var ?Binary
+     * @var array
      */
-    protected ?Binary $resultSet;
+    private array $placeholders = [];
 
     /**
-     * @var array
+     * @var ?Binary
      */
-    private array $placeholders = [];
+    public ?Binary $resultSet;
 
     /**
      * @param string $sql
@@ -251,7 +252,7 @@ public function execute(array $params = []): static
                 }
 
                 $correctType = Type::fromValue($value) ?: $this->params[$key]->type;
-                $header .=  Encode::FixedLengthInteger($correctType->value, 2);
+                $header .= Encode::FixedLengthInteger($correctType->value, 2);
                 $body .= ProtocolBinary::encode($value, $correctType);
             }
 
@@ -267,6 +268,14 @@ public function execute(array $params = []): static
         return $this;
     }
 
+    /**
+     * @return void
+     */
+    public function close(): void
+    {
+        $this->connection->request("\x19", pack('V', $this->statementOk->stmtId));
+    }
+
     /**
      * @param string $content
      * @return void

src/PDO.php

@@ -31,7 +31,7 @@ class PDO extends PDOAlias
     /**
      * @var ClientInterface 数据库客户端
      */
-    private readonly ClientInterface $client;
+    public readonly ClientInterface $client;
 
     /**
      * PDO 构造
@@ -41,10 +41,10 @@ class PDO extends PDOAlias
      * @param array|null $options
      */
     public function __construct(
-        private readonly string  $dsn,
-        private readonly ?string $username = null,
-        private readonly ?string $password = null,
-        private ?array           $options = null
+        public readonly string  $dsn,
+        public readonly ?string $username = null,
+        public readonly ?string $password = null,
+        public ?array           $options = []
     ) {
         $config = Config::formString($this->dsn, $this->username, $this->password);
         $this->client = match (strtolower($config->driver)) {
@@ -70,7 +70,7 @@ public function __destruct()
      */
     public function prepare(string $query, array $options = []): PDOStatementAlias|false
     {
-        return new PDOStatement($this->client->prepare($query), $this->options);
+        return new PDOStatement($query, fn () => $this);
     }
 
     /**
@@ -82,7 +82,7 @@ public function prepare(string $query, array $options = []): PDOStatementAlias|f
      */
     public function query(string $query, ?int $fetchMode = null, ...$fetchModeArgs): PDOStatementAlias
     {
-        return new ResultStatement($this->client->query($query), $this->options);
+        return new PDOStatement($query, fn () => $this, $this->client->query($query));
     }
 
     /**
@@ -208,6 +208,7 @@ public function quote(mixed $string, int $type = PDOAlias::PARAM_STR): string|fa
                 return $string ? '1' : '0';
             case PDOAlias::PARAM_STR:
             default:
+                $string = (string)$string;
                 $escaped = '';
                 $len = strlen($string);
                 for ($i = 0; $i < $len; $i++) {
@@ -228,6 +229,7 @@ public function quote(mixed $string, int $type = PDOAlias::PARAM_STR): string|fa
                         $escaped .= $c;
                     }
                 }
+
                 return "'$escaped'";
         }
     }

src/PDOPool.php

@@ -488,6 +488,7 @@ public function quote(mixed $string, int $type = PDOAlias::PARAM_STR): string|fa
                 return $string ? '1' : '0';
             case PDOAlias::PARAM_STR:
             default:
+                $string = (string)$string;
                 $escaped = '';
                 $len = strlen($string);
                 for ($i = 0; $i < $len; $i++) {