Allow stored procedures to be defined without BEGIN/END
#1834
+307
−91
Conversation
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
aharpervc
commented
Apr 30, 2025
src/parser/mod.rs
Outdated
Comment on lines
15103
to
15113
| let begin_token: AttachedToken = self | ||
| .expect_keyword(Keyword::BEGIN) | ||
| .map(AttachedToken) | ||
| .unwrap_or_else(|_| AttachedToken::empty()); | ||
| let statements = self.parse_statement_list(&[Keyword::END])?; | ||
| let end_token = match &begin_token.0.token { | ||
| Token::Word(w) if w.keyword == Keyword::BEGIN => { | ||
| AttachedToken(self.expect_keyword(Keyword::END)?) | ||
| } | ||
| _ => AttachedToken::empty(), | ||
| }; |
There was a problem hiding this comment.
Could also do it like this: https://github.com/apache/datafusion-sqlparser-rs/pull/1810/files#diff-6f6a082c3ddfc1f16cc4a455e3e2e2d2508f77b682ab18cabee69471bbb3edb3R244-R260, not sure which is best
aharpervc
commented
May 1, 2025
src/ast/mod.rs
Outdated
Comment on lines
3747
to
3753
| body: Vec<Statement>, | ||
| body: BeginEndStatements, |
There was a problem hiding this comment.
It it an abuse of BeginEndStatements to potentially have the begin/end token be empty? This could alternately be an enum of BeginEndStatements and Sequence, similar to elsewhere
- similar to functions & procedures, this dialect can define triggers with a multi statement block - there's no `EXECUTE` keyword here, so that means the `exec_body` used by other dialects becomes an `Option`, and our `statements` is also optional for them
- formerly, a semicolon after the last statement in a procedure was non-canonical (because they were added via `join`); a `BeginEndStatements` statements list will always write them out - `BeginEndStatements` begin/end tokens won't be written when empty - EOF now concludes parsing a statement list
aharpervc
force-pushed
the
mssql-create-procedure-body
branch
from
dd8382e to
ffd3b6a
Compare
|
I have temporarily rebased this branch on #1810 to pick up the new helper function and similarly use the enum pattern to distinguish between Sequence & BeginEndStatements. |
…tokens - this further consolidates with existing patterns
aharpervc
force-pushed
the
mssql-create-procedure-body
branch
from
ffd3b6a to
038d3c2
Compare
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.
For SQL Server, you can make a stored procedure without begin/end (docs ref). Otherwise, it parses the same way.
To differentiate with/without in the parser, the stored procedure struct's
statementsfield was changed fromVec<Statement>(where begin/end are required & implicit) to aBeginEndStatements, where the begin/end tokens are explicit. They're empty when missing & written when present.This PR also includes the fix to allow EOF to end a statement list from #1831 (so whichever merges first, I'll rebase accordingly)
The diff is perhaps larger than expected due to the question of canonical semicolons for procedure statement bodies. Formerly, a semicolon after the last statement in a procedure was non-canonical (because they were added via
join... so perhaps not particular intentional for it to have been that way); aBeginEndStatementsstatements list will always write them out.An additional test case example without begin/end has been added as well.