Fixes

Author: sclubricants

system/Database/BaseBuilder.php

@@ -2225,13 +2225,11 @@ protected function _updateBatch(string $table, array $values, string $index): st
         $sql .= implode(
             " UNION ALL\n",
             array_map(
-                static function ($value) use ($keys) {
-                    return 'SELECT ' . implode(', ', array_map(
-                        static fn ($key, $index) => $index . ' ' . $key,
-                        $keys,
-                        $value
-                    ));
-                },
+                static fn($value) => 'SELECT ' . implode(', ', array_map(
+                    static fn ($key, $index) => $index . ' ' . $key,
+                    $keys,
+                    $value
+                )),
                 $values
             )
         ) . "\n";

system/Database/MySQLi/Builder.php

@@ -75,13 +75,11 @@ protected function _updateBatch(string $table, array $values, string $index): st
         $sql .= implode(
             " UNION ALL\n",
             array_map(
-                static function ($value) use ($keys) {
-                    return 'SELECT ' . implode(', ', array_map(
-                        static fn ($key, $index) => $index . ' ' . $key,
-                        $keys,
-                        $value
-                    ));
-                },
+                static fn($value) => 'SELECT ' . implode(', ', array_map(
+                    static fn ($key, $index) => $index . ' ' . $key,
+                    $keys,
+                    $value
+                )),
                 $values
             )
         ) . "\n";

system/Database/OCI8/Builder.php

@@ -250,12 +250,11 @@ protected function _updateBatch(string $table, array $values, string $index): st
         $sql .= implode(
             " UNION ALL\n",
             array_map(
-                static function ($value) use ($keys) {
-                    return 'SELECT ' . implode(', ', array_map(
-                        static fn ($key, $index) => $index . ' ' . $key,
-                        $keys,
-                        $value
-                    )) . ' FROM DUAL';
+                static fn($value) => 'SELECT ' . implode(', ', array_map(
+                    static fn ($key, $index) => $index . ' ' . $key,
+                    $keys,
+                    $value
+                )) . ' FROM DUAL',
                 },
                 $values
             )

system/Database/SQLite3/Builder.php

@@ -70,4 +70,39 @@ protected function _truncate(string $table): string
     {
         return 'DELETE FROM ' . $table;
     }
+
+    /**
+     * Generates a platform-specific batch update string from the supplied data
+     */
+    protected function _updateBatch(string $table, array $values, string $index): string
+    {
+        if ((float) $this->db->getVersion() >= 3.33) {
+            return parent::_updateBatch($table, $values, $index);
+        }
+
+        $ids   = [];
+        $final = [];
+
+        foreach ($values as $val) {
+            $ids[] = $val[$index];
+
+            foreach (array_keys($val) as $field) {
+                if ($field !== $index) {
+                    $final[$field][] = 'WHEN ' . $index . ' = ' . $val[$index] . ' THEN ' . $val[$field];
+                }
+            }
+        }
+
+        $cases = '';
+
+        foreach ($final as $k => $v) {
+            $cases .= $k . " = CASE \n"
+                . implode("\n", $v) . "\n"
+                . 'ELSE ' . $k . ' END, ';
+        }
+
+        $this->where($index . ' IN(' . implode(',', $ids) . ')', null, false);
+
+        return 'UPDATE ' . $this->compileIgnore('update') . $table . ' SET ' . substr($cases, 0, -2) . $this->compileWhereHaving('QBWhere');
+    }
 }

tests/system/Database/Builder/UpdateTest.php

@@ -231,8 +231,6 @@ public function testUpdateBatch()
         $query = $this->db->getLastQuery();
         $this->assertInstanceOf(MockQuery::class, $query);
 
-        $space = ' ';
-
         $expected = <<<'EOF'
             UPDATE "jobs"
             SET