fix: $builder->ignore()->insertBatch() only ignores on first iteratio…

…n of batch
codeigniter4 · Feb 10, 2022 · 99800ac · 99800ac
1 parent e5c0d9c
commit 99800ac
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 0 deletions.
diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
@@ -1662,7 +1662,9 @@ public function insertBatch(?array $set = null, ?bool $escape = null, int $batch
             }
 
             if (! $hasQBSet) {
+                $ignore = $this->QBIgnore;
                 $this->resetWrite();
+                $this->QBIgnore = $ignore;
             }
         }
 

diff --git a/system/Test/Mock/MockBuilder.php b/system/Test/Mock/MockBuilder.php
@@ -15,4 +15,9 @@
 
 class MockBuilder extends BaseBuilder
 {
+    protected $supportedIgnoreStatements = [
+        'update' => 'IGNORE',
+        'insert' => 'IGNORE',
+        'delete' => 'IGNORE',
+    ];
 }
diff --git a/tests/system/Database/Builder/InsertTest.php b/tests/system/Database/Builder/InsertTest.php
@@ -100,6 +100,43 @@ public function testInsertBatch()
         $this->assertSame($expected, str_replace("\n", ' ', $query->getQuery()));
     }
 
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/5671
+     */
+    public function testInsertBatchIgnore()
+    {
+        $builder = $this->db->table('jobs');
+
+        $insertData = [
+            [
+                'id'          => 2,
+                'name'        => 'Commedian',
+                'description' => 'There\'s something in your teeth',
+            ],
+            [
+                'id'          => 3,
+                'name'        => 'Cab Driver',
+                'description' => 'I am yellow',
+            ],
+        ];
+
+        $this->db->shouldReturn('execute', 1)->shouldReturn('affectedRows', 1);
+        $builder->ignore()->insertBatch($insertData, true, 1);
+
+        $query = $this->db->getLastQuery();
+        $this->assertInstanceOf(Query::class, $query);
+
+        $raw = <<<'SQL'
+            INSERT IGNORE INTO "jobs" ("description", "id", "name") VALUES ('I am yellow',3,'Cab Driver')
+            SQL;
+        $this->assertSame($raw, str_replace("\n", ' ', $query->getOriginalQuery()));
+
+        $expected = <<<'SQL'
+            INSERT IGNORE INTO "jobs" ("description", "id", "name") VALUES ('I am yellow',3,'Cab Driver')
+            SQL;
+        $this->assertSame($expected, str_replace("\n", ' ', $query->getQuery()));
+    }
+
     public function testInsertBatchWithoutEscape()
     {
         $builder = $this->db->table('jobs');