Remove Generator

yiisoft · Oct 31, 2023 · 3ee30e3 · 3ee30e3
1 parent b8fa78a
commit 3ee30e3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/src/DMLQueryBuilder.php b/src/DMLQueryBuilder.php
@@ -4,7 +4,6 @@
 
 namespace Yiisoft\Db\Oracle;
 
-use Generator;
 use JsonException;
 use Yiisoft\Db\Exception\Exception;
 use Yiisoft\Db\Exception\InvalidArgumentException;
@@ -32,14 +31,14 @@ final class DMLQueryBuilder extends AbstractDMLQueryBuilder
      * @throws InvalidConfigException
      * @throws NotSupportedException
      */
-    public function batchInsert(string $table, array $columns, iterable|Generator $rows, array &$params = []): string
+    public function batchInsert(string $table, array $columns, iterable $rows, array &$params = []): string
     {
         if (empty($rows)) {
             return '';
         }
 
         $values = [];
-        $columns = $this->getNormalizeColumnNames($columns);
+        $columns = $this->getNormalizeColumnNames('', $columns);
         $columnSchemas = $this->schema->getTableSchema($table)?->getColumns() ?? [];
 
         /** @psalm-var array[] $rows */

diff --git a/tests/QueryBuilderTest.php b/tests/QueryBuilderTest.php
@@ -4,7 +4,6 @@
 
 namespace Yiisoft\Db\Oracle\Tests;
 
-use Generator;
 use Throwable;
 use Yiisoft\Db\Exception\Exception;
 use Yiisoft\Db\Exception\InvalidArgumentException;
@@ -125,7 +124,7 @@ public function testAlterColumn(): void
      * @throws InvalidArgumentException
      * @throws NotSupportedException
      */
-    public function testBatchInsert(string $table, array $columns, iterable|Generator $rows, string $expected): void
+    public function testBatchInsert(string $table, array $columns, iterable $rows, string $expected): void
     {
         parent::testBatchInsert($table, $columns, $rows, $expected);
     }