Merge pull request #7148 from kenjis/fix-Builder-set-RawSql

fix: [QueryBuilder] RawSql passed to set() disappears without error

Author: kenjis

system/Database/BaseBuilder.php

@@ -3215,6 +3215,10 @@ protected function objectToArray($object)
             return $object;
         }
 
+        if ($object instanceof RawSql) {
+            throw new InvalidArgumentException('RawSql "' . $object . '" cannot be used here.');
+        }
+
         $array = [];
 
         foreach (get_object_vars($object) as $key => $val) {

tests/system/Database/Builder/InsertTest.php

@@ -16,6 +16,7 @@
 use CodeIgniter\Database\RawSql;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockConnection;
+use InvalidArgumentException;
 
 /**
  * @internal
@@ -279,4 +280,22 @@ public function testInsertBatchThrowsExceptionOnEmptyData()
         $this->expectExceptionMessage('insertBatch() has no data.');
         $builder->insertBatch([]);
     }
+
+    public function testSetIncorrectRawSqlUsage()
+    {
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage(
+            'RawSql "expires = DATE_ADD(NOW(), INTERVAL 2 HOUR)" cannot be used here.'
+        );
+
+        $builder = $this->db->table('auth_bearer');
+
+        $builder->testMode()
+            ->set([
+                'jti'       => 'jti',
+                'proctorID' => '12',
+            ])
+            ->set(new RawSql('expires = DATE_ADD(NOW(), INTERVAL 2 HOUR)'))
+            ->insert();
+    }
 }