Skip to content

Add support for parsing with semicolons optional #1843

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 6 commits into
base: main
Choose a base branch
from
Draft

Add support for parsing with semicolons optional #1843

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3c27f11
Allow stored procedures to be defined without `BEGIN`/`END`
aharpervc Apr 30, 2025
fc95b8f
Define procedure bodies as `ConditionalStatements` rather than empty …
aharpervc May 2, 2025
b693c8d
Introduce `require_semicolon_statement_delimiter` parser option
aharpervc Apr 28, 2025
fda524c
Reduce ambiguity for consecutive statements
aharpervc May 7, 2025
2585c5b
Disallow keywords as table aliases for parsing statements without sem…
aharpervc May 8, 2025
b985bd9
Enable parsing comma lists without semicolons
aharpervc May 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/keywords.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1088,6 +1088,11 @@ pub const RESERVED_FOR_TABLE_ALIAS: &[Keyword] = &[
Keyword::TABLESAMPLE,
Keyword::FROM,
Keyword::OPEN,
Keyword::INSERT,
Keyword::UPDATE,
Keyword::DELETE,
Keyword::EXEC,
Keyword::EXECUTE,
];

/// Can't be used as a column alias, so that `SELECT <expr> alias`
Expand Down
17 changes: 17 additions & 0 deletions tests/sqlparser_common.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -666,6 +666,23 @@ fn parse_select_with_table_alias() {
);
}

#[test]
fn parse_consecutive_queries() {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure what the best approach here is, or if there's even a better solution apart from disallowing any unquoted keyword as an alias

Copy link
Contributor Author

@aharpervc aharpervc May 8, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It turns out doing that seems reasonable and reduces ambiguity. Dialects that require semicolon delimiters remain unaffected, but dialects where it's optional would need to quote the keyword as an identifier. That seems completely reasonable from a parser perspective.

I'm willing to drop the commit that added keywords to RESERVED_FOR_TABLE_ALIAS since this approach addresses that concern.

let select_then_exec = "SELECT * FROM deleted; EXECUTE my_sp 'some', 'params'";
let _ = all_dialects()
.parse_sql_statements(select_then_exec)
.unwrap();
let _ = all_dialects_not_requiring_semicolon_statement_delimiter()
.statements_without_semicolons_parse_to(select_then_exec, "");

let select_then_update = "SELECT 1 FROM x; UPDATE y SET z = 1";
let _ = all_dialects()
.parse_sql_statements(select_then_update)
.unwrap();
let _ = all_dialects_not_requiring_semicolon_statement_delimiter()
.statements_without_semicolons_parse_to(select_then_update, "");
}

#[test]
fn parse_analyze() {
verified_stmt("ANALYZE TABLE test_table");
Expand Down
Loading