misc fixes

Author: sclubricants

system/Database/BaseBuilder.php

@@ -1919,15 +1919,13 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 
         $sql .= 'ON DUPLICATE KEY UPDATE' . "\n";
 
-        $sql .= implode(
+        return $sql . implode(
             ",\n",
             array_map(
                 static fn ($columnName) => '`' . $columnName . '` = VALUES(`' . $columnName . '`)',
                 $updateFields
             )
         );
-
-        return $sql;
     }
 
     /**

system/Database/OCI8/Builder.php

@@ -139,7 +139,8 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
         foreach ($values as $value) {
             $sql .= 'SELECT ';
             $sql .= implode(', ', array_map(
-                static fn ($columnName, $value) => $value . ' ' . $columnName, $keys,
+                static fn ($columnName, $value) => $value . ' ' . $columnName,
+                $keys,
                 $value
             ));
             $sql .= " FROM DUAL UNION ALL\n";
@@ -169,9 +170,9 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 
         $sql .= "\nWHEN NOT MATCHED THEN INSERT (" . implode(', ', $keys) . ")\nVALUES ";
 
-        $sql .= (' (' . implode(', ', array_map(static fn ($columnName) => '"_upsert".' . $columnName, $keys)) . ')');
-
-        return $sql;
+        return $sql . (' ('
+            . implode(', ', array_map(static fn ($columnName) => '"_upsert".' . $columnName, $keys))
+            . ')');
     }
 
     /**

system/Database/Postgre/Builder.php

@@ -260,15 +260,13 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 
         $sql .= "DO UPDATE SET\n";
 
-        $sql .= implode(
+        return $sql . implode(
             ",\n",
             array_map(
                 static fn ($updateField) => '"' . $updateField . '" = "excluded"."' . $updateField . '"',
                 $updateFields
             )
         );
-
-        return $sql;
     }
 
     /**

system/Database/SQLite3/Builder.php

@@ -12,6 +12,7 @@
 namespace CodeIgniter\Database\SQLite3;
 
 use CodeIgniter\Database\BaseBuilder;
+use CodeIgniter\Database\Exceptions\DatabaseException;
 
 /**
  * Builder for SQLite3
@@ -118,14 +119,12 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 
         $sql .= "DO UPDATE SET\n";
 
-        $sql .= implode(
+        return $sql . implode(
             ",\n",
             array_map(
                 static fn ($updateField) => '`' . $updateField . '` = `excluded`.`' . $updateField . '`',
                 $updateFields
             )
         );
-
-        return $sql;
     }
 }