Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions fuzz/fuzz_seeds/generic_2770_only_table_name.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
SELECT * FROM only;
4 changes: 0 additions & 4 deletions src/dialect/generic.rs
Original file line number Diff line number Diff line change
Expand Up @@ -337,10 +337,6 @@ impl Dialect for GenericDialect {
true
}

fn supports_table_inheritance_markers(&self) -> bool {
true
}

fn supports_select_format(&self) -> bool {
true
}
Expand Down
47 changes: 47 additions & 0 deletions tests/sqlparser_common.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23579,3 +23579,50 @@ $$"#,
);
}
}

#[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);
}
}
27 changes: 15 additions & 12 deletions tests/sqlparser_postgres.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12178,12 +12178,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);

Expand All @@ -12192,7 +12191,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)
}
Expand All @@ -12205,7 +12204,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),
..
Expand All @@ -12214,19 +12213,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());
Expand Down Expand Up @@ -12266,7 +12269,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}");
}
Expand Down
Loading