Fix #888 issue

src/Command/AbstractCommand.php

@@ -6,6 +6,7 @@
 
 use Closure;
 use Throwable;
+use Yiisoft\Db\Connection\ConnectionInterface;
 use Yiisoft\Db\Exception\Exception;
 use Yiisoft\Db\Query\DataReaderInterface;
 use Yiisoft\Db\Query\QueryInterface;
@@ -201,22 +202,26 @@
      *
      * @deprecated Use {@see insertBatch()} instead. It will be removed in version 3.0.0.
      */
-    public function batchInsert(string $table, array $columns, iterable $rows): static
+    public function batchInsert(string $table, array $columns, iterable $rows): BatchCommand
     {
         return $this->insertBatch($table, $rows, $columns);
     }
 
-    public function insertBatch(string $table, iterable $rows, array $columns = []): static
+    public function insertBatch(string $table, iterable $rows, array $columns = [], int $rowsAtOnceLimit = 0): BatchCommand
     {
         $table = $this->getQueryBuilder()->getQuoter()->getRawTableName($table);
+        $db = $this->getConnection();
 
-        $params = [];
-        $sql = $this->getQueryBuilder()->insertBatch($table, $rows, $columns, $params);
-
-        $this->setRawSql($sql);
-        $this->bindValues($params);
+        $statements = $this->getQueryBuilder()->insertBatch($table, $rows, $columns, $rowsAtOnceLimit);
+        $commands = [];
+        foreach ($statements as $statement) {
+            $command = $db->createCommand();
+            $command->setRawSql($statement->sql);
+            $command->bindValues($statement->params);
 
-        return $this;
+            $commands[] = $command;
+        }
+        return new BatchCommand($commands);
     }
 
     abstract public function bindValue(int|string $name, mixed $value, ?int $dataType = null): static;
@@ -521,6 +526,11 @@
         return $this->setSql($sql)->bindValues($params);
     }
 
+    /**
+     * @return ConnectionInterface The query builder instance.
+     */
+    abstract protected function getConnection(): ConnectionInterface;
+
     /**
      * @return QueryBuilderInterface The query builder instance.
      */

src/Command/BatchCommand.php

@@ -0,0 +1,44 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Db\Command;
+
+use Yiisoft\Db\Exception\Exception;
+
+/**
+ * Object used as batch commands container
+ */
+final class BatchCommand
+{
+    /**
+     * @param CommandInterface[] $commands Query statements for execution
+     */
+    public function __construct(private readonly array $commands)
+    {
+    }
+
+    public function count(): int
+    {
+        return count($this->commands);
+    }
+
+    public function getCommands(): array
+    {
+        return $this->commands;
+    }
+
+    /**
+     * @throws \Throwable
+     * @throws Exception
+     */
+    public function execute(): int
+    {
+        $total = 0;
+        foreach ($this->commands as $command) {
+            $total += $command->execute();
+        }
+
+        return $total;
+    }
+}

src/Command/CommandInterface.php

@@ -193,6 +193,8 @@ public function alterColumn(string $table, string $column, ColumnInterface|strin
      * @param string $table The name of the table to insert new rows into.
      * @param iterable $rows The rows to be batch inserted into the table.
      * @param string[] $columns The column names.
+     * @param int $rowsAtOnceLimit Limit number of rows inserted at once. Default 0 - means maximum allowed by DBMS. If
+     * provided value is greater, than supported by DBMS, then DBMS maximum value will be used.
      *
      * @throws Exception
      * @throws InvalidArgumentException
@@ -201,7 +203,7 @@ public function alterColumn(string $table, string $column, ColumnInterface|strin
      *
      * Note: The method will quote the `table` and `column` parameters before using them in the generated SQL.
      */
-    public function insertBatch(string $table, iterable $rows, array $columns = []): static;
+    public function insertBatch(string $table, iterable $rows, array $columns = [], int $rowsAtOnceLimit = 0): BatchCommand;
 
     /**
      * Binds a parameter to the SQL statement to be executed.

src/Command/QueryStatement.php

@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Db\Command;
+
+/**
+ * Represents an SQL statement used for batch commands execution.
+ */
+class QueryStatement
+{
+    /**
+     * @param string $sql SQL query.
+     * @param array $params Parameters for query execution.
+     */
+    public function __construct(public string $sql, public array $params = [])
+    {
+    }
+}

src/Connection/AbstractConnection.php

@@ -117,4 +117,13 @@ protected function rollbackTransactionOnLevel(TransactionInterface $transaction,
             }
         }
     }
+
+    public function getParametersLimit(): int
+    {
+        // Must be overridden in a DBMS package which has a limit
+        if ($this->getDriverName() === 'pgsql') {
+            return 65535;
+        }
+        return 0;
+    }
 }

src/Connection/ConnectionInterface.php

@@ -227,4 +227,10 @@ public function setTablePrefix(string $value): void;
      * @psalm-param Closure(ConnectionInterface):mixed|Closure(ConnectionInterface):void $closure
      */
     public function transaction(Closure $closure, ?string $isolationLevel = null): mixed;
+
+    /**
+     * Returns maximum number of bound parameters for a DBMS. Default is 0 which means unlimited.
+     * @return int
+     */
+    public function getParametersLimit(): int;
 }

src/Debug/CommandInterfaceProxy.php

@@ -6,6 +6,7 @@
 
 use Closure;
 use Throwable;
+use Yiisoft\Db\Command\BatchCommand;
 use Yiisoft\Db\Command\CommandInterface;
 use Yiisoft\Db\Query\DataReaderInterface;
 use Yiisoft\Db\Query\QueryInterface;
@@ -99,11 +100,11 @@ public function alterColumn(string $table, string $column, ColumnInterface|strin
     }
 
     /**
-     * @psalm-suppress MixedArgument
+     * @psalm-suppress MixedReturnStatement
      */
-    public function insertBatch(string $table, iterable $rows, array $columns = []): static
+    public function insertBatch(string $table, iterable $rows, array $columns = [], int $rowsAtOnceLimit = 0): BatchCommand
     {
-        return new self($this->decorated->{__FUNCTION__}(...func_get_args()), $this->collector);
+        return $this->decorated->{__FUNCTION__}(...func_get_args());
     }
 
     /**

src/Debug/ConnectionInterfaceProxy.php

@@ -163,4 +163,9 @@ public function getDriverName(): string
     {
         return $this->connection->getDriverName();
     }
+
+    public function getParametersLimit(): int
+    {
+        return $this->connection->getParametersLimit();
+    }
 }

src/Driver/Pdo/AbstractPdoCommand.php

@@ -14,6 +14,7 @@
 use Yiisoft\Db\Command\AbstractCommand;
 use Yiisoft\Db\Command\Param;
 use Yiisoft\Db\Command\ParamInterface;
+use Yiisoft\Db\Connection\ConnectionInterface;
 use Yiisoft\Db\Exception\ConvertException;
 use Yiisoft\Db\Exception\Exception;
 use Yiisoft\Db\Exception\InvalidParamException;
@@ -165,6 +166,11 @@ protected function bindPendingParams(): void
         }
     }
 
+    protected function getConnection(): ConnectionInterface
+    {
+        return $this->db;
+    }
+
     protected function getQueryBuilder(): QueryBuilderInterface
     {
         return $this->db->getQueryBuilder();