Fix: join/pivot/lateral order and simplify

setup.py

@@ -26,7 +26,7 @@
         "dev": [
             "autoflake",
             "black",
-            "duckdb",
+            "duckdb>=0.6",
             "isort",
             "mypy>=0.990",
             "pandas",

sqlglot/generator.py

@@ -1160,13 +1160,13 @@ def table_sql(self, expression: exp.Table, sep: str = " AS ") -> str:
         alias = f"{sep}{alias}" if alias else ""
         hints = self.expressions(expression, key="hints", sep=", ", flat=True)
         hints = f" WITH ({hints})" if hints and self.TABLE_HINTS else ""
-        laterals = self.expressions(expression, key="laterals", sep="")
-        joins = self.expressions(expression, key="joins", sep="")
         pivots = self.expressions(expression, key="pivots", sep="")
+        joins = self.expressions(expression, key="joins", sep="")
+        laterals = self.expressions(expression, key="laterals", sep="")
         system_time = expression.args.get("system_time")
         system_time = f" {self.sql(expression, 'system_time')}" if system_time else ""
 
-        return f"{table}{system_time}{alias}{hints}{laterals}{joins}{pivots}"
+        return f"{table}{system_time}{alias}{hints}{pivots}{joins}{laterals}"
 
     def tablesample_sql(
         self, expression: exp.TableSample, seed_prefix: str = "SEED", sep=" AS "

sqlglot/parser.py

@@ -727,6 +727,7 @@ class Parser(metaclass=_Parser):
     }
 
     QUERY_MODIFIER_PARSERS = {
+        "laterals": lambda self: list(iter(self._parse_lateral, None)),
         "match": lambda self: self._parse_match_recognize(),
         "where": lambda self: self._parse_where(),
         "group": lambda self: self._parse_group(),
@@ -1979,25 +1980,12 @@ def _parse_query_modifiers(self, this: t.Optional[exp.Expression]) -> None:
         if not isinstance(this, self.MODIFIABLES):
             return
 
-        table = isinstance(this, exp.Table)
-
-        while True:
-            join = self._parse_join()
-            if join:
-                this.append("joins", join)
-
-            lateral = None
-            if not join:
-                lateral = self._parse_lateral()
-                if lateral:
-                    this.append("laterals", lateral)
-
-            comma = None if table else self._match(TokenType.COMMA)
-            if comma:
+        join = self._parse_join()
+        while join:
+            this.append("joins", join)
+            while self._match(TokenType.COMMA):
                 this.args["from"].append("expressions", self._parse_table())
-
-            if not (lateral or join or comma):
-                break
+            join = self._parse_join()
 
         for key, parser in self.QUERY_MODIFIER_PARSERS.items():
             expression = parser(self)

tests/fixtures/identity.sql

@@ -411,7 +411,7 @@ SELECT 1 AS delete, 2 AS alter
 SELECT * FROM (x)
 SELECT * FROM ((x))
 SELECT * FROM ((SELECT 1))
-SELECT * FROM (x LATERAL VIEW EXPLODE(y) JOIN foo)
+SELECT * FROM (x JOIN foo LATERAL VIEW EXPLODE(y))
 SELECT * FROM (SELECT 1) AS x
 SELECT * FROM (SELECT 1 UNION SELECT 2) AS x
 SELECT * FROM (SELECT 1 UNION ALL SELECT 2) AS x