Refactor, extend tests

Author: iamgergo

src/Illuminate/Database/Query/Grammars/SQLiteGrammar.php

@@ -200,19 +200,17 @@ protected function compileJsonPatch($column, $value)
      */
     protected function compileUpdateColumns(Builder $query, array $values)
     {
-        $groups = collect($this->groupJsonColumnsForUpdate($values))->map(function ($value, $key) {
-            $column = last(explode('.', $key));
-
-            return $this->wrap($column).' = '.$this->compileJsonPatch($column, $value);
-        });
+        $groups = $this->groupJsonColumnsForUpdate($values);
 
         return collect($values)->reject(function ($value, $key) {
             return $this->isJsonSelector($key);
-        })->map(function ($value, $key) {
+        })->merge($groups)->map(function ($value, $key) use ($groups) {
             $column = last(explode('.', $key));
 
-            return $this->wrap($column).' = '.$this->parameter($value);
-        })->merge($groups)->implode(', ');
+            $updateSql = isset($groups[$key]) ? $this->compileJsonPatch($column, $value) : $this->parameter($value);
+
+            return $this->wrap($column).' = '.$updateSql;
+        })->implode(', ');
     }
 
     /**

tests/Database/DatabaseQueryBuilderTest.php

@@ -2557,13 +2557,14 @@ public function testSQLiteUpdateWrappingNestedJsonArray()
         $builder->getConnection()->shouldReceive('update')
             ->with('update "users" set "group_id" = 45, "created_at" = ?, "options" = json_patch(ifnull("options", json(\'{}\')), json(?))', [
                 new DateTime('2019-08-06'),
-                json_encode(['name' => 'Taylor', 'security' => ['2fa' => false, 'presets' => ['laravel', 'vue']]]),
+                json_encode(['name' => 'Taylor', 'security' => ['2fa' => false, 'presets' => ['laravel', 'vue']], 'sharing' => ['twitter' => 'username']]),
             ]);
 
         $builder->from('users')->update([
             'options->name' => 'Taylor',
-            'options->security' => ['2fa' => false, 'presets' => ['laravel', 'vue']],
             'group_id' => new Raw('45'),
+            'options->security' => ['2fa' => false, 'presets' => ['laravel', 'vue']],
+            'options->sharing->twitter' => 'username',
             'created_at' => new DateTime('2019-08-06'),
         ]);
     }