Skip to content

fix(parser): query mods and set ops in FROM-first syntax #6092

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 2 commits into from
Oct 13, 2025
+18 −0
Merged

fix(parser): query mods and set ops in FROM-first syntax #6092

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c9b06a1
fix(parser): query mods and set ops in FROM-first syntax
geooo109 Oct 13, 2025
cff1487
add test
geooo109 Oct 13, 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
1 change: 1 addition & 0 deletions sqlglot/parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3225,6 +3225,7 @@ def _parse_wrapped_select(self, table: bool = False) -> t.Optional[exp.Expressio
this = select
else:
this = exp.select("*").from_(t.cast(exp.From, from_))
this = self._parse_query_modifiers(self._parse_set_operations(this))
else:
this = (
self._parse_table(consume_pipe=True)
Expand Down
17 changes: 17 additions & 0 deletions tests/dialects/test_duckdb.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1119,6 +1119,23 @@ def test_duckdb(self):
"DELETE FROM t USING (VALUES (1)) AS t1(c), (VALUES (1), (2)) AS t2(c) WHERE t.c = t1.c AND t.c = t2.c"
)

self.validate_identity(
"FROM (FROM t1 UNION FROM t2)",
"SELECT * FROM (SELECT * FROM t1 UNION SELECT * FROM t2)",
)
self.validate_identity(
"FROM (FROM (SELECT 1) AS t2(c), (SELECT t2.c AS c0))",
"SELECT * FROM (SELECT * FROM (SELECT 1) AS t2(c), (SELECT t2.c AS c0))",
)
self.validate_identity(
"FROM (FROM (SELECT 2000 as amount) t GROUP BY amount HAVING SUM(amount) > 1000)",
"SELECT * FROM (SELECT * FROM (SELECT 2000 AS amount) AS t GROUP BY amount HAVING SUM(amount) > 1000)",
)
self.validate_identity(
"(FROM (SELECT 1) t1(c) EXCEPT FROM (SELECT 2) t2(c)) UNION ALL (FROM (SELECT 3) t3(c) EXCEPT FROM (SELECT 4) t4(c))",
"(SELECT * FROM (SELECT 1) AS t1(c) EXCEPT SELECT * FROM (SELECT 2) AS t2(c)) UNION ALL (SELECT * FROM (SELECT 3) AS t3(c) EXCEPT SELECT * FROM (SELECT 4) AS t4(c))",
)

def test_array_index(self):
with self.assertLogs(helper_logger) as cm:
self.validate_all(
Expand Down