Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/Illuminate/Database/Query/Grammars/MySqlGrammar.php
Original file line number Diff line number Diff line change
Expand Up @@ -442,6 +442,7 @@ protected function compileUpdateWithoutJoins(Builder $query, $table, $columns, $
* @param array $values
* @return array
*/
#[\Override]
public function prepareBindingsForUpdate(array $bindings, array $values)
{
$values = (new Collection($values))
Expand Down
3 changes: 3 additions & 0 deletions src/Illuminate/Database/Query/Grammars/PostgresGrammar.php
Original file line number Diff line number Diff line change
Expand Up @@ -618,6 +618,7 @@ protected function compileUpdateWithJoinsOrLimit(Builder $query, array $values)
* @param array $values
* @return array
*/
#[\Override]
public function prepareBindingsForUpdate(array $bindings, array $values)
{
$values = (new Collection($values))->map(function ($value, $column) {
Expand All @@ -628,6 +629,8 @@ public function prepareBindingsForUpdate(array $bindings, array $values)

$cleanBindings = Arr::except($bindings, 'select');

$values = Arr::flatten(array_map(fn ($value) => value($value), $values));

return array_values(
array_merge($values, Arr::flatten($cleanBindings))
);
Expand Down
3 changes: 3 additions & 0 deletions src/Illuminate/Database/Query/Grammars/SQLiteGrammar.php
Original file line number Diff line number Diff line change
Expand Up @@ -384,6 +384,7 @@ protected function compileUpdateWithJoinsOrLimit(Builder $query, array $values)
* @param array $values
* @return array
*/
#[\Override]
public function prepareBindingsForUpdate(array $bindings, array $values)
{
$groups = $this->groupJsonColumnsForUpdate($values);
Expand All @@ -396,6 +397,8 @@ public function prepareBindingsForUpdate(array $bindings, array $values)

$cleanBindings = Arr::except($bindings, 'select');

$values = Arr::flatten(array_map(fn ($value) => value($value), $values));

return array_values(
array_merge($values, Arr::flatten($cleanBindings))
);
Expand Down
3 changes: 3 additions & 0 deletions src/Illuminate/Database/Query/Grammars/SqlServerGrammar.php
Original file line number Diff line number Diff line change
Expand Up @@ -453,10 +453,13 @@ public function compileUpsert(Builder $query, array $values, array $uniqueBy, ar
* @param array $values
* @return array
*/
#[\Override]
public function prepareBindingsForUpdate(array $bindings, array $values)
{
$cleanBindings = Arr::except($bindings, 'select');

$values = Arr::flatten(array_map(fn ($value) => value($value), $values));

return array_values(
array_merge($values, Arr::flatten($cleanBindings))
);
Expand Down
54 changes: 52 additions & 2 deletions tests/Integration/Database/QueryBuilderUpdateTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,25 +19,75 @@ protected function afterRefreshingDatabase()
$table->string('name')->nullable();
$table->string('title')->nullable();
$table->string('status')->nullable();
$table->integer('credits')->nullable();
$table->json('payload')->nullable();
});

Schema::create('example_credits', function (Blueprint $table) {
$table->increments('id');
$table->unsignedBigInteger('example_id');
$table->integer('credits');
});
}

#[DataProvider('jsonValuesDataProvider')]
#[RequiresDatabase(['sqlite', 'mysql', 'mariadb'])]
public function testBasicUpdateForJson($column, $given, $expected)
{
DB::table('example')->insert([
['name' => 'Taylor Otwell', 'title' => 'Mr.'],
]);

DB::table('example')->update([
$column => $given,
]);

$this->assertDatabaseHas('example', [
'name' => 'Taylor Otwell',
'title' => 'Mr.',
$column => $column === 'payload' ? $this->castAsJson($expected) : $expected,
]);
}

#[RequiresDatabase(['sqlite', 'mysql', 'mariadb'])]
public function testSubqueryUpdate()
{
DB::table('example')->insert([
['name' => 'Taylor Otwell', 'title' => 'Mr.'],
['name' => 'Tim MacDonald', 'title' => 'Mr.'],
]);

DB::table('example_credits')->insert([
['example_id' => 1, 'credits' => 10],
['example_id' => 1, 'credits' => 20],
]);

$this->assertDatabaseHas('example', [
'name' => 'Taylor Otwell',
'title' => 'Mr.',
'credits' => null,
]);

$this->assertDatabaseHas('example', [
'name' => 'Tim MacDonald',
'title' => 'Mr.',
'credits' => null,
]);

DB::table('example')->update([$column => $given]);
DB::table('example')->update([
'credits' => DB::table('example_credits')->selectRaw('sum(credits)')->whereColumn('example_credits.example_id', 'example.id'),
]);

$this->assertDatabaseHas('example', [
'name' => 'Taylor Otwell',
'title' => 'Mr.',
$column => $column === 'payload' ? $this->castAsJson($expected) : $expected,
'credits' => 30,
]);

$this->assertDatabaseHas('example', [
'name' => 'Tim MacDonald',
'title' => 'Mr.',
'credits' => null,
]);
}

Expand Down