From 0b79fff0259b528f68b6a8c10704feeb52ef8441 Mon Sep 17 00:00:00 2001 From: Colin McDonnell <3084745+colinhacks@users.noreply.github.com> Date: Tue, 17 Nov 2026 00:06:56 -0800 Subject: [PATCH 1/4] MsSql: Stop reading statement keywords such as SET as implicit aliases --- .../mssql_statement_keyword_not_alias.sql | 2 ++ src/dialect/mssql.rs | 9 +++++++++ tests/sqlparser_mssql.rs | 20 +++++++++++++++++++ 3 files changed, 31 insertions(+) create mode 100644 fuzz/fuzz_seeds/mssql_statement_keyword_not_alias.sql diff --git a/fuzz/fuzz_seeds/mssql_statement_keyword_not_alias.sql b/fuzz/fuzz_seeds/mssql_statement_keyword_not_alias.sql new file mode 100644 index 0000000000..69d0bd99fd --- /dev/null +++ b/fuzz/fuzz_seeds/mssql_statement_keyword_not_alias.sql @@ -0,0 +1,2 @@ +SELECT 1 +SET @x = 1 \ No newline at end of file diff --git a/src/dialect/mssql.rs b/src/dialect/mssql.rs index 98f660d7e2..877432c4ce 100644 --- a/src/dialect/mssql.rs +++ b/src/dialect/mssql.rs @@ -227,6 +227,15 @@ impl MsSqlDialect { | Keyword::THROW | Keyword::RAISERROR | Keyword::MERGE + | Keyword::SET + | Keyword::BEGIN + | Keyword::OPEN + | Keyword::CLOSE + | Keyword::DEALLOCATE + | Keyword::GRANT + | Keyword::DENY + | Keyword::WAITFOR + | Keyword::KILL ) } diff --git a/tests/sqlparser_mssql.rs b/tests/sqlparser_mssql.rs index cadcabf035..74c6e8be35 100644 --- a/tests/sqlparser_mssql.rs +++ b/tests/sqlparser_mssql.rs @@ -2653,6 +2653,10 @@ fn test_sql_keywords_as_column_aliases() { "SELECT col AS ELSE FROM tbl", "Expected: an identifier after AS, found: ELSE", ), + ( + "SELECT col AS SET FROM tbl", + "Expected: an identifier after AS, found: SET", + ), ] { assert_eq!( tsql().parse_sql_statements(sql), @@ -2782,6 +2786,15 @@ fn test_tsql_statement_keywords_not_implicit_aliases() { ("select 1\ncreate table t (id int)", 2), ("select 1\nalter table t add col int", 2), ("select 1\nreturn", 2), + ("select 1\nset @x = 1", 2), + ("select 1\nbegin tran", 2), + ("select 1\nopen c", 2), + ("select 1\nclose c", 2), + ("select 1\ndeallocate c", 2), + ("select 1\ngrant select on t to u", 2), + ("select 1\ndeny select on t to u", 2), + ("select 1\nwaitfor delay '00:00:01'", 2), + ("select 1\nkill 52", 2), ]; for (sql, expected) in col_alias_cases { let stmts = tsql() @@ -2800,6 +2813,13 @@ fn test_tsql_statement_keywords_not_implicit_aliases() { ("select * from t\ndrop table t", 2), ("select * from t\ncreate table u (id int)", 2), ("select * from t\nexec sp_who", 2), + ("select * from t\nbegin tran", 2), + ("select * from t\nclose c", 2), + ("select * from t\ndeallocate c", 2), + ("select * from t\ngrant select on t to u", 2), + ("select * from t\ndeny select on t to u", 2), + ("select * from t\nwaitfor delay '00:00:01'", 2), + ("select * from t\nkill 52", 2), ]; for (sql, expected) in tbl_alias_cases { let stmts = tsql() From 781c5565210991addc5fde77fff2e77045014277 Mon Sep 17 00:00:00 2001 From: Colin McDonnell <3084745+colinhacks@users.noreply.github.com> Date: Tue, 17 Nov 2026 10:05:16 -0800 Subject: [PATCH 2/4] Keep COMMIT, ROLLBACK and REVOKE out of aliases too --- src/dialect/mssql.rs | 3 +++ tests/sqlparser_mssql.rs | 11 +++++++++++ 2 files changed, 14 insertions(+) diff --git a/src/dialect/mssql.rs b/src/dialect/mssql.rs index 877432c4ce..6e0ee7e1e3 100644 --- a/src/dialect/mssql.rs +++ b/src/dialect/mssql.rs @@ -236,6 +236,9 @@ impl MsSqlDialect { | Keyword::DENY | Keyword::WAITFOR | Keyword::KILL + | Keyword::COMMIT + | Keyword::ROLLBACK + | Keyword::REVOKE ) } diff --git a/tests/sqlparser_mssql.rs b/tests/sqlparser_mssql.rs index 74c6e8be35..7416936f76 100644 --- a/tests/sqlparser_mssql.rs +++ b/tests/sqlparser_mssql.rs @@ -2795,6 +2795,8 @@ fn test_tsql_statement_keywords_not_implicit_aliases() { ("select 1\ndeny select on t to u", 2), ("select 1\nwaitfor delay '00:00:01'", 2), ("select 1\nkill 52", 2), + ("select 1\ncommit", 2), + ("select 1\nrollback tran", 2), ]; for (sql, expected) in col_alias_cases { let stmts = tsql() @@ -2820,6 +2822,8 @@ fn test_tsql_statement_keywords_not_implicit_aliases() { ("select * from t\ndeny select on t to u", 2), ("select * from t\nwaitfor delay '00:00:01'", 2), ("select * from t\nkill 52", 2), + ("select * from t\ncommit", 2), + ("select * from t\nrollback tran", 2), ]; for (sql, expected) in tbl_alias_cases { let stmts = tsql() @@ -2831,6 +2835,11 @@ fn test_tsql_statement_keywords_not_implicit_aliases() { "expected {expected} stmts for: {sql:?}" ); } + + let stmts = tsql() + .parse_sql_statements("select 1\nrevoke select on t from u") + .unwrap(); + assert!(matches!(stmts[..], [_, Statement::Revoke(_)])); } #[test] @@ -3002,4 +3011,6 @@ fn parse_quoted_statement_keyword_aliases() { ms().one_statement_parses_to("SELECT 1 [PRINT]", "SELECT 1 AS [PRINT]"); ms().verified_stmt("SELECT * FROM t [PRINT]"); ms().verified_stmt("SELECT * FROM t AS [PRINT]"); + ms().one_statement_parses_to("SELECT 1 [SET]", "SELECT 1 AS [SET]"); + ms().verified_stmt("SELECT * FROM t AS [BEGIN]"); } From 37917cd543948a0bc1bcac9d6eb74537f68f9e3d Mon Sep 17 00:00:00 2001 From: Colin McDonnell <3084745+colinhacks@users.noreply.github.com> Date: Tue, 17 Nov 2026 10:19:16 -0800 Subject: [PATCH 3/4] Cover REVOKE after a table name --- tests/sqlparser_mssql.rs | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/tests/sqlparser_mssql.rs b/tests/sqlparser_mssql.rs index 7416936f76..2e51f10be8 100644 --- a/tests/sqlparser_mssql.rs +++ b/tests/sqlparser_mssql.rs @@ -2836,10 +2836,13 @@ fn test_tsql_statement_keywords_not_implicit_aliases() { ); } - let stmts = tsql() - .parse_sql_statements("select 1\nrevoke select on t from u") - .unwrap(); - assert!(matches!(stmts[..], [_, Statement::Revoke(_)])); + for sql in [ + "select 1\nrevoke select on t from u", + "select * from t\nrevoke select on t from u", + ] { + let stmts = tsql().parse_sql_statements(sql).unwrap(); + assert!(matches!(stmts[..], [_, Statement::Revoke(_)]), "{sql:?}"); + } } #[test] From 21d6517aa2c89106fbff02529e832f8b6cf84120 Mon Sep 17 00:00:00 2001 From: Colin McDonnell <3084745+colinhacks@users.noreply.github.com> Date: Tue, 17 Nov 2026 10:28:46 -0800 Subject: [PATCH 4/4] Name the fuzz seed after the PR --- ...d_not_alias.sql => mssql_2991_statement_keyword_not_alias.sql} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename fuzz/fuzz_seeds/{mssql_statement_keyword_not_alias.sql => mssql_2991_statement_keyword_not_alias.sql} (100%) diff --git a/fuzz/fuzz_seeds/mssql_statement_keyword_not_alias.sql b/fuzz/fuzz_seeds/mssql_2991_statement_keyword_not_alias.sql similarity index 100% rename from fuzz/fuzz_seeds/mssql_statement_keyword_not_alias.sql rename to fuzz/fuzz_seeds/mssql_2991_statement_keyword_not_alias.sql