From a59a0eb13f2fc3e9688cf77e931ed8fdfc123ebb Mon Sep 17 00:00:00 2001 From: blaginin Date: Wed, 18 Nov 2026 21:27:55 +0000 Subject: [PATCH] Generic: Preserve ONLY as an unquoted table name (#3003) Backport to the 0.64 release line. (cherry picked from commit 97afe813af61bfe6ab1327b706def645a9b07615) --- .../generic_2770_only_table_name.sql | 1 + src/dialect/generic.rs | 4 -- tests/sqlparser_common.rs | 47 +++++++++++++++++++ tests/sqlparser_postgres.rs | 27 ++++++----- 4 files changed, 63 insertions(+), 16 deletions(-) create mode 100644 fuzz/fuzz_seeds/generic_2770_only_table_name.sql diff --git a/fuzz/fuzz_seeds/generic_2770_only_table_name.sql b/fuzz/fuzz_seeds/generic_2770_only_table_name.sql new file mode 100644 index 0000000000..0398346db8 --- /dev/null +++ b/fuzz/fuzz_seeds/generic_2770_only_table_name.sql @@ -0,0 +1 @@ +SELECT * FROM only; diff --git a/src/dialect/generic.rs b/src/dialect/generic.rs index 4f1875b874..cafa085275 100644 --- a/src/dialect/generic.rs +++ b/src/dialect/generic.rs @@ -333,10 +333,6 @@ impl Dialect for GenericDialect { true } - fn supports_table_inheritance_markers(&self) -> bool { - true - } - fn supports_select_format(&self) -> bool { true } diff --git a/tests/sqlparser_common.rs b/tests/sqlparser_common.rs index 0882b95c8a..934c6014b3 100644 --- a/tests/sqlparser_common.rs +++ b/tests/sqlparser_common.rs @@ -23414,3 +23414,50 @@ fn display_create_procedure_begin_atomic_propagates_write_errors() { assert_eq!(write!(writer, "{stmt}"), Err(fmt::Error), "{rejected:?}"); } } + +#[test] +fn parse_only_table_name() { + let dialects = TestedDialects::new(vec![Box::new(GenericDialect {})]); + for (sql, expected_name, expected_alias) in [ + ("SELECT * FROM only", "only", None), + ("SELECT * FROM only;", "only", None), + ("SELECT * FROM only t", "only", Some("t")), + ("SELECT * FROM only AS t", "only", Some("t")), + ("SELECT * FROM ONLY t", "ONLY", Some("t")), + ("SELECT * FROM only.t", "only.t", None), + ] { + let select = dialects.verified_only_select_with_canonical(sql, sql.trim_end_matches(';')); + let TableFactor::Table { + name, + alias, + inheritance, + .. + } = &select.from[0].relation + else { + panic!("expected a table: {select:?}"); + }; + assert_eq!(name.to_string(), expected_name); + assert_eq!( + alias.as_ref().map(|a| a.name.value.as_str()), + expected_alias + ); + assert_eq!(*inheritance, None); + } + + for sql in [ + "SELECT * FROM only WHERE id = 1", + "SELECT * FROM only ORDER BY id", + "SELECT * FROM only LIMIT 1", + "SELECT * FROM only JOIN other ON only.id = other.id", + "SELECT * FROM only, other", + "SELECT * FROM only UNION SELECT * FROM other", + "SELECT * FROM other JOIN only ON other.id = only.id", + "SELECT * FROM (SELECT * FROM only) AS t", + "UPDATE only SET id = 1", + "UPDATE only AS t SET id = 1", + "DELETE FROM only", + "DELETE FROM only WHERE id = 1", + ] { + dialects.verified_stmt(sql); + } +} diff --git a/tests/sqlparser_postgres.rs b/tests/sqlparser_postgres.rs index 613a8022e8..9bedc3c68f 100644 --- a/tests/sqlparser_postgres.rs +++ b/tests/sqlparser_postgres.rs @@ -12123,12 +12123,11 @@ fn parse_table_inheritance_markers() { ), ("SELECT * FROM \"only\"", "\"only\"", None, None), ] { - let select = pg_and_generic().verified_only_select(sql); + let select = pg().verified_only_select(sql); assert_relation(&select.from[0].relation, name, alias, inheritance); } - let select = - pg_and_generic().verified_only_select("SELECT * FROM ONLY a JOIN b * ON a.id = b.id"); + let select = pg().verified_only_select("SELECT * FROM ONLY a JOIN b * ON a.id = b.id"); assert_relation(&select.from[0].relation, "a", None, only); assert_relation(&select.from[0].joins[0].relation, "b", None, descendants); @@ -12137,7 +12136,7 @@ fn parse_table_inheritance_markers() { ("UPDATE ONLY (t) SET id = 1", only_parenthesized), ("UPDATE t * SET id = 1", descendants), ] { - match pg_and_generic().verified_stmt(sql) { + match pg().verified_stmt(sql) { Statement::Update(Update { table, .. }) => { assert_relation(&table.relation, "t", None, inheritance) } @@ -12150,7 +12149,7 @@ fn parse_table_inheritance_markers() { ("DELETE FROM ONLY (t)", only_parenthesized), ("DELETE FROM t *", descendants), ] { - match pg_and_generic().verified_stmt(sql) { + match pg().verified_stmt(sql) { Statement::Delete(Delete { from: FromTable::WithFromKeyword(from), .. @@ -12159,19 +12158,23 @@ fn parse_table_inheritance_markers() { } } - pg_and_generic().one_statement_parses_to("SELECT * FROM t*", "SELECT * FROM t *"); - pg_and_generic().one_statement_parses_to("SELECT * FROM ONLY(t)", "SELECT * FROM ONLY (t)"); - pg_and_generic().one_statement_parses_to("UPDATE t* SET id = 1", "UPDATE t * SET id = 1"); - pg_and_generic().one_statement_parses_to("DELETE FROM t*", "DELETE FROM t *"); + pg().one_statement_parses_to("SELECT * FROM t*", "SELECT * FROM t *"); + pg().one_statement_parses_to("SELECT * FROM ONLY(t)", "SELECT * FROM ONLY (t)"); + pg().one_statement_parses_to("UPDATE t* SET id = 1", "UPDATE t * SET id = 1"); + pg().one_statement_parses_to("DELETE FROM t*", "DELETE FROM t *"); + + assert_eq!( + pg().parse_sql_statements("SELECT * FROM ONLY").unwrap_err(), + ParserError::ParserError("Expected: identifier, found: EOF".to_string()) + ); for sql in [ - "SELECT * FROM ONLY", "SELECT * FROM ONLY t *", "SELECT * FROM ONLY (t *)", "SELECT * FROM ONLY (t", "SELECT * FROM ONLY ()", ] { - assert!(pg_and_generic().parse_sql_statements(sql).is_err(), "{sql}"); + assert!(pg().parse_sql_statements(sql).is_err(), "{sql}"); } let other_dialects = all_dialects_where(|d| !d.supports_table_inheritance_markers()); @@ -12211,7 +12214,7 @@ fn display_table_inheritance_propagates_write_errors() { ("SELECT * FROM t *", " *"), ("SELECT * FROM t", "t"), ] { - let stmt = pg_and_generic().verified_stmt(sql); + let stmt = pg().verified_stmt(sql); let mut writer = RejectingWriter(rejected); assert_eq!(write!(writer, "{stmt}"), Err(fmt::Error), "{sql}"); }