Allow keywords in locales when creating ICU collations (Fixes issue #6903) #6914
Conversation
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
|
✅ Build firebird 1.0.3105 completed (commit a33f0a463f by @) |
tkeinz
changed the title
asfernandes
requested changes
Aug 2, 2021
src/common/unicode_util.cpp
Outdated
| continue; | ||
|
|
||
| icu->ucolClose(testCollator); | ||
| if (U_FAILURE(status) || (status == U_USING_DEFAULT_WARNING)) |
There was a problem hiding this comment.
I tried create collation unicode_ptbr for utf8 from unicode 'LOCALE=pt_BRx' and it worked, but should not.
Can you change that to if (status != U_ZERO_ERROR) to treat warnings as errors?
There was a problem hiding this comment.
Oops, good catch. Thank you!
While I had tested with completely invalid locale names, I missed testing with partially valid ones. Changed as requested; now your example also fails (and the examples from my use cases continue to work).
|
For master, I'm going to completely avoid the |
asfernandes
pushed a commit
that referenced
this pull request
Aug 4, 2021
…6903) (#6914) * Allow keywords in locales when creating ICU collations * Change ICU locale creation check to fail for any warning. Co-authored-by: Thomas Keinz <[email protected]>
|
::: test details ::: |
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.
This fix adds a fallback check when trying to create an ICU collator and the check against locale base names has failed. With this fallback check, locales with keywords are accepted when creating a collation. In my tests, the collation worked as expected when applied to a table column.
Please let me know in case this is not the right branch against which to submit the change.