Fix quoted SQLite collation parsing - #7493
Open
Boulea7 wants to merge 1 commit into
Open
Conversation
Member
|
Please rebase onto the latest changes from 3.10.x in order to fix the CI. |
Author
|
Thanks for the heads-up. I’ll rebase this branch onto the latest 3.10.x and update the CI results. |
Tokenize column definitions according to SQLite identifier quoting rules so schema introspection returns unquoted collation names without mistaking DEFAULT or CHECK expressions for column collations. Fixes doctrine#6129
Boulea7
force-pushed
the
fix-sqlite-collation-quoting
branch
from
August 11, 2026 16:23
87dfeb9 to
a0892fd
Compare
Member
|
I've had a brief look at your implementation. You've implemented a rather heavy SQL parser here. Is that really necessary to fix your bug? I would like to avoid maintaining a parser, tbh. |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Summary
SQLite schema introspection now parses quoted collation identifiers according to SQLite quoting rules and returns their logical, unquoted names.
The parser distinguishes quoted tokens from the unquoted
COLLATEkeyword, ignores nested DEFAULT and CHECK expressions, and scans each CREATE TABLE statement once. Collations are matched throughColumn::getName(), so quoted reserved-word columns such as"DEFAULT"and"CHECK"retain their declared collation.Testing
vendor/bin/phpunit tests/Schema/SqliteSchemaManagerTest.php(42 tests, 62 assertions)vendor/bin/phpunit tests/Functional/Schema/SqliteSchemaManagerTest.php(109 tests, 483 assertions, 15 skipped)vendor/bin/phpcs(571 files)vendor/bin/phpstan --no-progress