-
Notifications
You must be signed in to change notification settings - Fork 11k
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
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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']; | ||
} | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why not use
$value->all()
and skip the implicitarray_map
call inside toCollection@toArray()
?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Also, I'd change the check to
$value instanceof Enumerable
, so$value->all()
also coversLazyCollection
instancesThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It might not be even worth it to pursue these changes. Using Collection as value is not in the docs (unless someone can share the URL) and Postgres/SQLServer would require different syntax to store JSON
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You're right. And it is easy enough for someone to just add
collect(...)->all()
on the call-siteThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think it's problematic though that the behaviour is somewhat undefined when passing in a collection (or at least very unexpected), especially as I think many devs don't actively differentiate between arrays and collections in Laravel as much Laravel functionality behaves the same no matter what you pass in.