Update test according to main PR (#260)

yiisoft · Apr 27, 2024 · 252b721 · 252b721
1 parent 0937af3
commit 252b721
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## 2.0.0 under development
 
+- Enh #260: Support `Traversable` values for `DMLQueryBuilder::batchInsert()` method with empty columns (@Tigrov)
 - Enh #255: Implement `SqlParser` and `ExpressionBuilder` driver classes (@Tigrov)
 
 ## 1.3.0 March 21, 2024

diff --git a/src/DMLQueryBuilder.php b/src/DMLQueryBuilder.php
@@ -30,6 +30,10 @@ final class DMLQueryBuilder extends AbstractDMLQueryBuilder
      */
     public function batchInsert(string $table, array $columns, iterable $rows, array &$params = []): string
     {
+        if (!is_array($rows)) {
+            $rows = $this->prepareTraversable($rows);
+        }
+
         if (empty($rows)) {
             return '';
         }

diff --git a/tests/CommandTest.php b/tests/CommandTest.php
@@ -65,7 +65,7 @@ public function testAddDefaultValue(): void
     public function testBatchInsert(
         string $table,
         array $columns,
-        array $values,
+        iterable $values,
         string $expected,
         array $expectedParams = [],
         int $insertedRow = 1

diff --git a/tests/Provider/CommandProvider.php b/tests/Provider/CommandProvider.php
@@ -61,7 +61,10 @@ public static function batchInsert(): array
             'empty columns and objects' => [
                 ':qp3' => '1',
             ],
-            'empty columns and Traversable' => [
+            'empty columns and a Traversable value' => [
+                ':qp3' => '1',
+            ],
+            'empty columns and Traversable values' => [
                 ':qp3' => '1',
             ],
         ];