-
Notifications
You must be signed in to change notification settings - Fork 1.9k
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
fix: Model handling of Entity $primaryKey casting #8282
Merged
Merged
Conversation
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
kenjis
force-pushed
the
fix-model-pk-with-cast
branch
from
December 1, 2023 08:52
6f7c53d
to
4ed4743
Compare
kenjis
changed the title
fix: Model handles cast $primaryKey value when using Entity
fix: Model handling of Entity $primaryKey casting
Dec 1, 2023
kenjis
force-pushed
the
fix-model-pk-with-cast
branch
from
December 1, 2023 09:55
4ed4743
to
2ee4979
Compare
kenjis
added
the
bug
Verified issues on the current code behavior or pull requests that will fix them
label
Dec 1, 2023
5 tasks
SQLite3::escapeString() is not binary safe. https://www.php.net/manual/en/sqlite3.escapestring.php
kenjis
force-pushed
the
fix-model-pk-with-cast
branch
from
December 1, 2023 22:34
f89e7dc
to
87a706c
Compare
UPDATE `db_uuid`
INNER JOIN (
SELECT '<binary_uuid_value_1>' `id`, 'update1' `value` UNION ALL
SELECT '<binary_uuid_value_2>' `id`, 'update2' `value`
) `_u`
ON `db_uuid`.`id` = `_u`.`id`
SET
`db_uuid`.`value` = `_u`.`value` The following patch makes the test pass: --- a/system/Database/MySQLi/Builder.php
+++ b/system/Database/MySQLi/Builder.php
@@ -131,7 +131,7 @@ class Builder extends BaseBuilder
" UNION ALL\n",
array_map(
static fn ($value) => 'SELECT ' . implode(', ', array_map(
- static fn ($key, $index) => $index . ' ' . $key,
+ static fn ($key, $index) => (is_string($index) ? '_binary' . $index : $index) . ' ' . $key,
$keys,
$value
)), This makes the following SQL: UPDATE `db_uuid`
INNER JOIN (
SELECT _binary'<binary_uuid_value_1>' `id`, _binary'update1' `value` UNION ALL
SELECT _binary'<binary_uuid_value_2>' `id`, _binary'update2' `value`
) `_u`
ON `db_uuid`.`id` = `_u`.`id`
SET
`db_uuid`.`value` = `_u`.`value` See https://dev.mysql.com/doc/refman/8.0/en/string-literals.html This is the same data type issue in |
michalsn
reviewed
Dec 2, 2023
@codeigniter4/database-team Review, please. |
michalsn
approved these changes
Dec 6, 2023
5 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description
Fixes #7797
Supersedes #8271
Checklist: