[SPARK-50449][SQL] Fix SQL Scripting grammar allowing empty bodies for loops, IF and CASE #48989
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
dejankrak-db
approved these changes
Nov 27, 2024
| condition = "PARSE_SYNTAX_ERROR", | ||
| parameters = Map("error" -> "'LOOP'", "hint" -> "")) | ||
| } | ||
|
|
||
| test("loop with if else block") { |
There was a problem hiding this comment.
Does it also make sense to add test with for with empty body, in this PR or your other one, depending on which you merge first?
There was a problem hiding this comment.
Yes, I will add it to the one which gets merged last, or if they both get merged then I will create a separate PR.
miland-db
approved these changes
Nov 27, 2024
| @@ -623,6 +652,21 @@ class SqlScriptingParserSuite extends SparkFunSuite with SQLHelper { | |||
| assert(whileStmt.label.contains("lbl")) | |||
| } | |||
|
|
|||
| test("while with empty body") { | |||
There was a problem hiding this comment.
Can we also add test like the one in PR description:
WHILE 1=1 DO
BEGIN
END;
END WHILE;
There was a problem hiding this comment.
I will add that one in the follow up PR, as that case is still not fixed.
MaxGekk
reviewed
Nov 27, 2024
There was a problem hiding this comment.
@dusantism-db Could you open an JIRA and prepend it to PR's title, please.
dusantism-db
changed the title
|
@MaxGekk done |
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?
Before this PR, SQL Scripting grammar allowed for loops, IF and CASE to have empty bodies. Example:
WHILE 1 = 1 DO END WHILE;If they have an empty body, an internal error is thrown during execution. This PR changes the grammar so that loops, IF and CASE must have at least one statement in their bodies.
Note that this does not completely fix the internal error issue. It is still possible to have something like
where the same error is still thrown, except this construct is correct grammar wise.
This issue will be fixed by a separate PR, as non-trivial interpreter logic changes are required.
Why are the changes needed?
The existing grammar was wrong.
Does this PR introduce any user-facing change?
No.
How was this patch tested?
Unit tests that make sure parsing loops, IF and CASE with empty bodies throws an error.
Was this patch authored or co-authored using generative AI tooling?
No.