Add use of setData() with upsert() and allow for getCompiledUpsert() on batch

Allowing the use of setData() along with set() on upsert(). This allows getCompiledUpsert() to be called with batches set with setData()

Author: sclubricants

system/Database/BaseBuilder.php

@@ -1885,35 +1885,28 @@ public function getCompiledUpsert()
      */
     public function upsert($set = null, ?bool $escape = null)
     {
+        // if set() function was used then we need to convert to setData()
         if ($set === null && ! empty($this->binds)) {
-            $set = [array_map(static fn ($columnName) => $columnName[0], $this->binds)];
-
+            $set         = [array_map(static fn ($columnName) => $columnName[0], $this->binds)];
             $this->binds = [];
-
-            $this->resetRun([
-                'QBSet'  => [],
-                'QBKeys' => [],
-            ]);
         } elseif ($set === null && ! empty($this->QBSet)) {
-            $set = [$this->QBSet];
-
-            $this->resetRun([
-                'QBSet'  => [],
-                'QBKeys' => [],
-            ]);
-        } else {
-            $set = [$set];
+            $set = $this->QBSet;
         }
 
+        $this->resetRun([
+            'QBSet'  => [],
+            'QBKeys' => [],
+        ]);
+
         $this->setData($set, $escape);
 
-        return $this->batchExecute('_upsertBatch', 1);
+        return $this->batchExecute('_upsertBatch');
     }
 
     /**
      * Compiles batch upsert strings and runs the queries
      *
-     * @param array|object|string|null $set a dataset or select query
+     * @param array|object|null $set a dataset
      *
      * @throws DatabaseException
      *

tests/system/Database/Live/UpsertTest.php

@@ -242,6 +242,32 @@ public function testGetCompiledUpsert()
             ->getCompiledUpsert());
     }
 
+    public function testGetCompiledUpsertBatch()
+    {
+        $userData = [
+            [
+                'email'   => '[email protected]',
+                'name'    => 'Ahmadinejad',
+                'country' => 'Iran',
+            ],
+            [
+                'email'   => '[email protected]',
+                'name'    => 'Pedro',
+                'country' => 'El Salvador',
+            ],
+        ];
+
+        $sql = $this->db->table('user')
+            ->setData($userData)
+            ->getCompiledUpsert();
+
+        $pos = strpos($sql, '[email protected]');
+        $this->assertTrue(($pos !== false));
+
+        $pos = strpos($sql, '[email protected]');
+        $this->assertTrue(($pos !== false));
+    }
+
     public function testUpsertCauseConstraintError()
     {
         $userData = [