Allow timestamp with both fractions and offset #1061
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
|
|
nicksnyder
changed the title
|
Thanks for the contribution @liskaant! Would you be able to add a test case? |
liskaant
force-pushed
the
fix-json-decode-timestamp
branch
from
b39cc92 to
b7c62cc
Compare
|
@nicksnyder Added a few. Hopefully in the right place, since I couldn't find any existing timestamp decoding tests. If not, please point me to the right place. |
timostamm
approved these changes
Jan 29, 2025
There was a problem hiding this comment.
The Protobuf conformance test suite includes several dozen tests for parsing Timestamp from JSON. That's why you didn't find explicit tests.
The suite does not cover fractions with less than 3 digits and fractions with a TZ offset, but both should be valid. Thanks for the fix and the tests, @liskaant.
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.
Regex parsing for JSON timestamps does not allow both fractional seconds and also express timezone in an offset format. For example the following timestamp does not match:
2025-01-27T11:42:15.689800+00:00.This change simply moves the match group for fractions before the offset capture and makes it optional. The ordering and indexes of
matchesare kept the same.It also allows fractions shorter than 3 digits, since RFC 3339 does not place such restriction and the fraction parsing later in this function handles it just fine.