[SPARK-47637][SQL] Use errorCapturingIdentifier in more places #45764
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
| @@ -76,7 +76,7 @@ statement | |||
| | ctes? dmlStatementNoWith #dmlStatement | |||
| | USE identifierReference #use | |||
| | USE namespace identifierReference #useNamespace | |||
| | SET CATALOG (identifier | stringLit) #setCatalog | |||
| | SET CATALOG (errorCapturingIdentifier | stringLit) #setCatalog | |||
There was a problem hiding this comment.
Do we consider extending:
IDENTIFIER
: (UNICODE_LETTER | DIGIT | '_')+
| UNICODE_LETTER+ '://' (UNICODE_LETTER | DIGIT | '_' | '/' | '-' | '.' | '?' | '=' | '&' | '#' | '%')+
to
IDENTIFIER
: (UNICODE_LETTER | DIGIT | '_' | '-')+
| UNICODE_LETTER+ '://' (UNICODE_LETTER | DIGIT | '_' | '/' | '-' | '.' | '?' | '=' | '&' | '#' | '%')+
so that we can remove all errorCapturingIdentifier for simplicity.
There was a problem hiding this comment.
We cannot. that would break SELECT c1 - c2 FROM VALUES(1, 2) AS T(c1, c2);
An interesting thought would be to flip the script and rename errorCapturingIdentifier to identifier.
And find another name for identifier like identifierIsExpression.
But that adds churn.
gengliangwang
approved these changes
Mar 29, 2024
|
Thanks, merging to master |
sweisdb
pushed a commit
to sweisdb/spark
that referenced
this pull request
Apr 1, 2024
### What changes were proposed in this pull request? errorCapturingIdentifier parses identifier with included '-' to raise INVALID_IDENTIFIER errors instead of SYNTAX_ERROR for non-delimited identifiers containing a hyphen. It is meant to be used wherever the context is not that of an expression This PR replaces a few missed identifiers with that rule. ### Why are the changes needed? Improve error messages for undelimited identifiers with a hyphen. ### Does this PR introduce _any_ user-facing change? No ### How was this patch tested? Added unit tests in ErrorParserSuite.scala ### Was this patch authored or co-authored using generative AI tooling? No Closes apache#45764 from srielau/SPARK-47637-errorCapturingIdentifier. Authored-by: Serge Rielau <serge@rielau.com> Signed-off-by: Gengliang Wang <gengliang@apache.org>
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.
What changes were proposed in this pull request?
errorCapturingIdentifier parses identifier with included '-' to raise INVALID_IDENTIFIER errors
instead of SYNTAX_ERROR for non-delimited identifiers containing a hyphen.
It is meant to be used wherever the context is not that of an expression
This PR replaces a few missed identifiers with that rule.
Why are the changes needed?
Improve error messages for undelimited identifiers with a hyphen.
Does this PR introduce any user-facing change?
No
How was this patch tested?
Added unit tests in ErrorParserSuite.scala
Was this patch authored or co-authored using generative AI tooling?
No