Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[11.x] Fix incorrect bindings in DB::update when using a collection as a value #53254

Merged
merged 3 commits into from
Oct 21, 2024
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
6 changes: 5 additions & 1 deletion src/Illuminate/Database/Query/Builder.php
Original file line number Diff line number Diff line change
Expand Up @@ -3848,7 +3848,11 @@ public function update(array $values)

$values = collect($values)->map(function ($value) {
if (! $value instanceof Builder) {
return ['value' => $value, 'bindings' => $value];
return ['value' => $value, 'bindings' => match (true) {
$value instanceof Collection => $value->all(),
$value instanceof UnitEnum => enum_value($value),
default => $value,
}];
}

[$query, $bindings] = $this->parseSub($value);
Expand Down
50 changes: 50 additions & 0 deletions tests/Integration/Database/QueryBuilderUpdateTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
<?php

namespace Illuminate\Tests\Integration\Database;

use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Schema;
use Orchestra\Testbench\Attributes\RequiresDatabase;
use PHPUnit\Framework\Attributes\DataProvider;

require_once 'Enums.php';

class QueryBuilderUpdateTest extends DatabaseTestCase
{
protected function afterRefreshingDatabase()
{
Schema::create('example', function (Blueprint $table) {
$table->increments('id');
$table->string('name')->nullable();
$table->string('title')->nullable();
$table->string('status')->nullable();
$table->json('payload')->nullable();
});
}

#[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,
]);
}

public static function jsonValuesDataProvider()
{
yield ['payload', ['Laravel', 'Founder'], ['Laravel', 'Founder']];
yield ['payload', collect(['Laravel', 'Founder']), ['Laravel', 'Founder']];
yield ['status', StringStatus::draft, 'draft'];
}
}