Fix: presto offset limit order closes tobymao#1754

sqlglot/dialects/presto.py

@@ -372,3 +372,11 @@ def generateseries_sql(self, expression: exp.GenerateSeries) -> str:
                     start = exp.Cast(this=start, to=to)
 
             return self.func("SEQUENCE", start, end, step)
+
+        def offset_limit_modifiers(
+            self, expression: exp.Expression, fetch: bool, limit: t.Optional[exp.Fetch | exp.Limit]
+        ) -> t.List[str]:
+            return [
+                self.sql(expression, "offset"),
+                self.sql(limit),
+            ]

sqlglot/generator.py

@@ -1526,7 +1526,7 @@ def matchrecognize_sql(self, expression: exp.MatchRecognize) -> str:
         return f"{self.seg('MATCH_RECOGNIZE')} {self.wrap(body)}{alias}"
 
     def query_modifiers(self, expression: exp.Expression, *sqls: str) -> str:
-        limit = expression.args.get("limit")
+        limit: t.Optional[exp.Fetch | exp.Limit] = expression.args.get("limit")
 
         if self.LIMIT_FETCH == "LIMIT" and isinstance(limit, exp.Fetch):
             limit = exp.Limit(expression=limit.args.get("count"))
@@ -1545,12 +1545,19 @@ def query_modifiers(self, expression: exp.Expression, *sqls: str) -> str:
             self.sql(expression, "having"),
             *self.after_having_modifiers(expression),
             self.sql(expression, "order"),
-            self.sql(expression, "offset") if fetch else self.sql(limit),
-            self.sql(limit) if fetch else self.sql(expression, "offset"),
+            *self.offset_limit_modifiers(expression, fetch, limit),
             *self.after_limit_modifiers(expression),
             sep="",
         )
 
+    def offset_limit_modifiers(
+        self, expression: exp.Expression, fetch: bool, limit: t.Optional[exp.Fetch | exp.Limit]
+    ) -> t.List[str]:
+        return [
+            self.sql(expression, "offset") if fetch else self.sql(limit),
+            self.sql(limit) if fetch else self.sql(expression, "offset"),
+        ]
+
     def after_having_modifiers(self, expression: exp.Expression) -> t.List[str]:
         return [
             self.sql(expression, "qualify"),

sqlglot/parser.py

@@ -3539,9 +3539,7 @@ def _parse_bracket(self, this):
         bracket_kind = self._prev.token_type
 
         if self._match(TokenType.COLON):
-            expressions: t.List[t.Optional[exp.Expression]] = [
-                self.expression(exp.Slice, expression=self._parse_conjunction())
-            ]
+            expressions = [self.expression(exp.Slice, expression=self._parse_conjunction())]
         else:
             expressions = self._parse_csv(lambda: self._parse_slice(self._parse_conjunction()))
 

tests/dialects/test_presto.py

@@ -440,6 +440,8 @@ def test_unnest(self):
         )
 
     def test_presto(self):
+        self.validate_identity("SELECT * FROM x OFFSET 1 LIMIT 1")
+        self.validate_identity("SELECT * FROM x OFFSET 1 FETCH FIRST 1 ROWS ONLY")
         self.validate_identity("SELECT BOOL_OR(a > 10) FROM asd AS T(a)")
         self.validate_identity("SELECT * FROM (VALUES (1))")
         self.validate_identity("START TRANSACTION READ WRITE, ISOLATION LEVEL SERIALIZABLE")