fix: gather affected rows after query call failed

Author: michalsn

system/Database/BaseBuilder.php

@@ -2198,7 +2198,7 @@ protected function formatValues(array $values): array
      *
      * @param array|object|null $set a dataset
      *
-     * @return false|int|list<string> Number of rows inserted or FALSE on failure, SQL array when testMode
+     * @return false|int|list<string> Number of rows inserted or FALSE on no data to perform an insert operation, SQL array when testMode
      */
     public function insertBatch($set = null, ?bool $escape = null, int $batchSize = 100)
     {

system/Database/Postgre/Connection.php

@@ -227,6 +227,10 @@ protected function getDriverFunctionPrefix(): string
      */
     public function affectedRows(): int
     {
+        if ($this->resultID === false) {
+            return 0;
+        }
+
         return pg_affected_rows($this->resultID);
     }
 

system/Database/SQLSRV/Connection.php

@@ -444,6 +444,10 @@ public function error(): array
      */
     public function affectedRows(): int
     {
+        if ($this->resultID === false) {
+            return 0;
+        }
+
         return sqlsrv_rows_affected($this->resultID);
     }
 

tests/system/Database/Live/InsertTest.php

@@ -13,6 +13,7 @@
 
 namespace CodeIgniter\Database\Live;
 
+use CodeIgniter\Database\Exceptions\DatabaseException;
 use CodeIgniter\Database\Forge;
 use CodeIgniter\Database\RawSql;
 use CodeIgniter\Test\CIUnitTestCase;
@@ -79,13 +80,31 @@ public function testInsertBatch(): void
             ],
         ];
 
-        $this->db->table($table)->insertBatch($data);
+        $count = $this->db->table($table)->insertBatch($data);
+
+        $this->assertSame(2, $count);
 
         $expected = $data;
         $this->seeInDatabase($table, $expected[0]);
         $this->seeInDatabase($table, $expected[1]);
     }
 
+    public function testInsertBatchFailed(): void
+    {
+        $this->expectException(DatabaseException::class);
+
+        $data = [
+            [
+                'name' => 'Grocery Sales',
+            ],
+            [
+                'name' => null,
+            ],
+        ];
+
+        $this->db->table('job')->insertBatch($data);
+    }
+
     public function testReplaceWithNoMatchingData(): void
     {
         $data = [

tests/system/Database/Live/TransactionTest.php

@@ -239,4 +239,28 @@ public function testTransStrictFalseAndDBDebugFalse(): void
 
         $this->enableDBDebug();
     }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/9362
+     */
+    public function testTransInsertBatchFailed(): void
+    {
+        $data = [
+            [
+                'name' => 'Grocery Sales',
+            ],
+            [
+                'name' => null,
+            ],
+        ];
+
+        $this->db->transBegin();
+        $this->db->table('job')->insertBatch($data);
+
+        $this->assertFalse($this->db->transStatus());
+
+        $this->db->transRollback();
+
+        $this->dontSeeInDatabase('job', ['name' => 'Grocery Sales']);
+    }
 }

user_guide_src/source/changelogs/v4.5.8.rst

@@ -30,6 +30,8 @@ Deprecations
 Bugs Fixed
 **********
 
+- **Database:** Fixed a bug where ``Builder::affectedRows()`` threw an error when the previous query call failed in ``Postgre`` and ``SQLSRV`` drivers.
+
 See the repo's
 `CHANGELOG.md <https://github.com/codeigniter4/CodeIgniter4/blob/develop/CHANGELOG.md>`_
 for a complete list of bugs fixed.