primary key validation in insertBatch

Author: michalsn

system/Model.php

@@ -373,6 +373,9 @@ protected function doInsertBatch(?array $set = null, ?bool $escape = null, int $
                 if (! isset($row[$this->primaryKey])) {
                     throw DataException::forEmptyPrimaryKey('insertBatch');
                 }
+
+                // Validate the primary key value
+                $this->validateID($row[$this->primaryKey], false);
             }
         }
 

tests/system/Models/InsertModelTest.php

@@ -431,6 +431,30 @@ public function testInsertWithInvalidPrimaryKeyWhenAutoIncrementDisabled(
         $this->createModel(WithoutAutoIncrementModel::class)->insert($insert);
     }
 
+    /**
+     * @param mixed        $invalidKey
+     * @param class-string $exception
+     */
+    #[DataProvider('provideInvalidPrimaryKeyValues')]
+    public function testInsertBatchWithInvalidPrimaryKeyWhenAutoIncrementDisabled($invalidKey, string $exception, string $exceptionMessage): void
+    {
+        $this->expectException($exception);
+        $this->expectExceptionMessage($exceptionMessage);
+
+        $insertData = [
+            [
+                'key'   => 'valid_key_1',
+                'value' => 'value1',
+            ],
+            [
+                'key'   => $invalidKey,  // Invalid key in second row
+                'value' => 'value2',
+            ],
+        ];
+
+        $this->createModel(WithoutAutoIncrementModel::class)->insertBatch($insertData);
+    }
+
     public static function provideInvalidPrimaryKeyValues(): iterable
     {
         return [

tests/system/Models/UpdateModelTest.php

@@ -562,7 +562,7 @@ public function testUpdateThrowDatabaseExceptionWithoutWhereClause($id, string $
         // $useSoftDeletes = false
         $this->createModel(JobModel::class);
 
-        $this->model->update($id, ['name' => 'Foo Bar']); // @phpstan-ignore argument.type
+        $this->model->update($id, ['name' => 'Foo Bar']);
     }
 
     public static function provideUpdateThrowDatabaseExceptionWithoutWhereClause(): iterable