[OPENJPA-2983] Resolve EXTRACT temporal fields by constant, not by name - #166
Merged
Conversation
CriteriaBuilderImpl.extract() derived the DateTimeExtractField from field.toString().toUpperCase(), which depends on the default locale and on the textual representation the specification constants happen to use. Map the LocalDateField / LocalTimeField / LocalDateTimeField constants to their DateTimeExtractField equivalents by identity instead, and reject any other temporal field with a meaningful message instead of letting Enum.valueOf fail. TestExtractTemporalField pins every entry of the new mapping table, which is where the risk now sits: it is a characterisation test of the 16 hand written pairs, not a reproduction of the original defect, since the name based lookup produced the same result for all constants once Locale.ROOT was passed.
cristof
approved these changes
Aug 29, 2026
solomax
approved these changes
Aug 31, 2026
solomax
approved these changes
Sep 2, 2026
solomax
left a comment
solomax
left a comment
Contributor
There was a problem hiding this comment.
I do remember I have approved this one already :)
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
3 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.
CriteriaBuilderImpl.extract()derived theDateTimeExtractFieldfromfield.toString().toUpperCase(...).Locale.ROOTon master closed the Turkish-locale hole, but the lookup still depended on the exact wording of the spec constants, and an unrecognised field failed withEnum.valueOf's "No enum constant ..." rather than anything actionable.The
LocalDateField/LocalTimeField/LocalDateTimeFieldconstants are now mapped to theirDateTimeExtractFieldequivalents by identity, and anything else is rejected with a meaningful message. Identity is safe: the three classes have a single private constructor, are notSerializable, and expose no factory.No behaviour change for working queries —
LocalDateTimeField.DATE/TIMEalready threwIllegalArgumentException(theirtoString()is lowercase, sovalueOfnever matched) and still do, with a better message.