Remove query input from $set in *Batch() methods

Author: sclubricants

system/Database/BaseBuilder.php

@@ -1917,16 +1917,14 @@ public function upsert($set = null, ?bool $escape = null)
     /**
      * Compiles batch upsert strings and runs the queries
      *
-     * @param array|BaseBuilder|object|RawSql|null $set a dataset
+     * @param array|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->setQueryAsData($set);
-
         if (isset($this->QBOptions['setQueryAsData'])) {
             $sql = $this->_upsertBatch($this->QBFrom[0], $this->QBKeys, []);
 
@@ -2151,14 +2149,12 @@ protected function formatValues(array $values): array
     /**
      * Compiles batch insert strings and runs the queries
      *
-     * @param array|BaseBuilder|object|RawSql|null $set a dataset
+     * @param array|object|null $set a dataset
      *
      * @return false|int|string[] Number of rows inserted or FALSE on failure, SQL array when testMode
      */
     public function insertBatch($set = null, ?bool $escape = null, int $batchSize = 100)
     {
-        $this->setQueryAsData($set);
-
         if (isset($this->QBOptions['setQueryAsData'])) {
             $sql = $this->_insertBatch($this->QBFrom[0], $this->QBKeys, []);
 
@@ -2520,15 +2516,13 @@ protected function validateUpdate(): bool
     /**
      * Sets data and calls batchExecute to run queries
      *
-     * @param array|BaseBuilder|object|RawSql|null $set         a dataset or select query
-     * @param array|RawSql|string|null             $constraints
+     * @param array|object|null        $set         a dataset
+     * @param array|RawSql|string|null $constraints
      *
      * @return false|int|string[] Number of rows affected or FALSE on failure, SQL array when testMode
      */
     public function updateBatch($set = null, $constraints = null, int $batchSize = 100)
     {
-        $this->setQueryAsData($set);
-
         $this->onConstraint($constraints);
 
         if (isset($this->QBOptions['setQueryAsData'])) {
@@ -2786,15 +2780,13 @@ public function delete($where = '', ?int $limit = null, bool $resetData = true)
     /**
      * Sets data and calls batchExecute to run queries
      *
-     * @param array|BaseBuilder|object|RawSql|null $set         a dataset
-     * @param array|RawSql|null                    $constraints
+     * @param array|object|null $set         a dataset
+     * @param array|RawSql|null $constraints
      *
      * @return false|int|string[] Number of rows affected or FALSE on failure, SQL array when testMode
      */
     public function deleteBatch($set = null, $constraints = null, int $batchSize = 100)
     {
-        $this->setQueryAsData($set);
-
         $this->onConstraint($constraints);
 
         if (isset($this->QBOptions['setQueryAsData'])) {

user_guide_src/source/database/query_builder/115.php

@@ -7,7 +7,7 @@
 
 $additionalUpdateField = ['updated_at' => new RawSql('CURRENT_TIMESTAMP')];
 
-$sql = $builder->onConstraint('email')->updateFields($additionalUpdateField, true)->upsertBatch($query);
+$sql = $builder->setQueryAsData($query)->onConstraint('email')->updateFields($additionalUpdateField, true)->upsertBatch();
 /* MySQLi produces:
     INSERT INTO `db_user` (`country`, `email`, `name`)
     SELECT user2.name, user2.email, user2.country