Add fromQuery() logic to updateBatch()

Author: sclubricants

system/Database/BaseBuilder.php

@@ -2054,13 +2054,15 @@ public function onConstraint($set)
     /**
      * Sets data source as a query for insert/update/upsert
      *
-     * @param BaseBuilder|string $query
+     * @param BaseBuilder|RawSql|string $query
      */
     public function fromQuery($query): BaseBuilder
     {
         if (! empty($query)) {
             if ($query instanceof BaseBuilder) {
                 $query = $query->getCompiledSelect();
+            } elseif ($query instanceof RawSql) {
+                $query = $query->__toString();
             }
 
             if (is_string($query)) {
@@ -2472,8 +2474,24 @@ protected function validateUpdate(): bool
      */
     public function updateBatch($set = null, $constraints = null, int $batchSize = 100)
     {
+        $this->fromQuery($set);
+
         $this->onConstraint($constraints);
 
+        if (isset($this->QBOptions['fromQuery'])) {
+            $sql = $this->_updateBatch($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 && $set !== []) {
             $this->setData($set, true);
         }