Add fromQuery() logic to upsertBatch()

Author: sclubricants

system/Database/BaseBuilder.php

@@ -1914,14 +1914,30 @@ public function upsert($set = null, ?bool $escape = null)
     /**
      * Compiles batch upsert strings and runs the queries
      *
-     * @param array|object|null $set a dataset
+     * @param array|BaseBuilder|RawSql|object|null $set a dataset
      *
      * @return false|int|string[] Number of affected rows or FALSE on failure, SQL array when testMode
      *
      * @throws DatabaseException
      */
     public function upsertBatch($set = null, ?bool $escape = null, int $batchSize = 100)
     {
+        $this->fromQuery($set);
+
+        if (isset($this->QBOptions['fromQuery'])) {
+            $sql = $this->_upsertBatch($this->QBFrom[0], $this->QBKeys, []);
+
+            if ($sql === '') {
+                return false; // @codeCoverageIgnore
+            }
+
+            $this->db->query($sql, null, false);
+
+            $this->resetWrite();
+
+            return $this->testMode ? $sql : $this->db->affectedRows();
+        }
+
         if ($set !== null) {
             $this->setData($set, $escape);
         }

tests/system/Database/Live/InsertTest.php

@@ -118,7 +118,7 @@ public function testInsertPasswordHash()
         $this->seeInDatabase('misc', ['value' => $hash]);
     }
 
-    public function testInsertWithQuery()
+    public function testInsertBatchWithQuery()
     {
         $this->forge = Database::forge($this->DBGroup);