Skip to content

Fix join precedence for non-snowflake queries #1905

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

Merged
merged 4 commits into from
Jun 28, 2025
Merged

Fix join precedence for non-snowflake queries #1905

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
16f7d6c
Fix join precedence for non-snowflake queries
Dimchikkk Jun 23, 2025
b42f58d
Merge remote-tracking branch 'origin/main'
Dimchikkk Jun 24, 2025
dae0a12
introduce dialect nested joins flag
Dimchikkk Jun 28, 2025
09f85f5
Merge remote-tracking branch 'origin/main'
Dimchikkk Jun 28, 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
2 changes: 1 addition & 1 deletion src/parser/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12486,7 +12486,7 @@ impl<'a> Parser<'a> {
};
let mut relation = self.parse_table_factor()?;

if self.peek_parens_less_nested_join() {
if dialect_of!(self is SnowflakeDialect) && self.peek_parens_less_nested_join() {
Copy link
Contributor

Choose a reason for hiding this comment

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

Can we change this to a dialect method that is only set to true for snowflake? e.g. if self.dialect.supports_parens_less_nested_join() && self.peek_parens_less_nested_join()

let joins = self.parse_joins()?;
relation = TableFactor::NestedJoin {
table_with_joins: Box::new(TableWithJoins { relation, joins }),
Expand Down
22 changes: 22 additions & 0 deletions tests/sqlparser_common.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15357,6 +15357,28 @@ fn check_enforced() {
);
}

#[test]
fn join_precedence() {
all_dialects_except(|d| d.is::<SnowflakeDialect>()).verified_query_with_canonical(
Copy link
Contributor

Choose a reason for hiding this comment

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

By switching to the dialect method, we would be able to change these to use all_dialects_where(|d|d.supports_parens_less_nested_join())

"SELECT *
FROM t1
NATURAL JOIN t5
INNER JOIN t0 ON (t0.v1 + t5.v0) > 0
WHERE t0.v1 = t1.v0",
// canonical string without parentheses
"SELECT * FROM t1 NATURAL JOIN t5 INNER JOIN t0 ON (t0.v1 + t5.v0) > 0 WHERE t0.v1 = t1.v0",
);
TestedDialects::new(vec![Box::new(SnowflakeDialect {})]).verified_query_with_canonical(
"SELECT *
FROM t1
NATURAL JOIN t5
INNER JOIN t0 ON (t0.v1 + t5.v0) > 0
WHERE t0.v1 = t1.v0",
// canonical string with parentheses
"SELECT * FROM t1 NATURAL JOIN (t5 INNER JOIN t0 ON (t0.v1 + t5.v0) > 0) WHERE t0.v1 = t1.v0",
);
}

#[test]
fn parse_create_procedure_with_parameter_modes() {
let sql = r#"CREATE PROCEDURE test_proc (IN a INTEGER, OUT b TEXT, INOUT c TIMESTAMP, d BOOL) AS BEGIN SELECT 1; END"#;
Expand Down
Loading