Merge pull request #6697 from sclubricants/FixTestModeWithUpsert

Fix testMode() with upsert() and getCompiledUpsert()

Author: kenjis

system/Database/BaseBuilder.php

@@ -1785,7 +1785,9 @@ protected function batchExecute(string $renderMethod, int $batchSize = 100)
             }
         }
 
-        $this->resetWrite();
+        if (! $this->testMode) {
+            $this->resetWrite();
+        }
 
         return $this->testMode ? $savedSQL : $affectedRows;
     }

tests/system/Database/Live/UpsertTest.php

@@ -640,4 +640,18 @@ public function testUpsertWithMultipleSet()
 
         $this->seeInDatabase('user', ['email' => '[email protected]', 'name' => 'Jarvis', 'country' => $dt]);
     }
+
+    public function testUpsertWithTestModeAndGetCompiledUpsert()
+    {
+        $userData = [
+            'email'   => '[email protected]',
+            'name'    => 'Upsert One',
+            'country' => 'US',
+        ];
+        $builder = $this->db->table('user');
+        $builder->testMode()->upsert($userData);
+        $sql = $builder->getCompiledUpsert();
+
+        $this->assertStringContainsString('[email protected]', $sql);
+    }
 }