This repository has been archived by the owner on Jan 28, 2021. It is now read-only.
sql: do not marshal strings containing JSON as a string in convert #710
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
Fixes src-d#709 When a string containing JSON (e.g. `{"a": 1, "b": true}`) is passed to JSON.Convert, it only did `json.Marshal`, so it was marshalled as a string (e.g. `"{\"a\":1,\"b\":true}"`), which made it impossible to use a string with JSON_EXTRACT, which would only receive the string. Now, JSON.Convert does a first check for strings. If it can be unmarshalled into JSON, then that JSON is marshalled and returned. Otherwise, it's a string and marshalled as such. Signed-off-by: Miguel Molina <miguel@erizocosmi.co>
kuba--
approved these changes
May 14, 2019
ajnavarro
approved these changes
May 14, 2019
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Fixes #709
When a string containing JSON (e.g.
{"a": 1, "b": true}) is passedto JSON.Convert, it only did
json.Marshal, so it was marshalled asa string (e.g.
"{\"a\":1,\"b\":true}"), which made it impossibleto use a string with JSON_EXTRACT, which would only receive the
string.
Now, JSON.Convert does a first check for strings. If it can be
unmarshalled into JSON, then that JSON is marshalled and returned.
Otherwise, it's a string and marshalled as such.
Signed-off-by: Miguel Molina miguel@erizocosmi.co