merge limit clauses

PostHog · Feb 8, 2023 · fef9463 · fef9463
1 parent 839d505
commit fef9463
Show file tree

Hide file tree

Showing 6 changed files with 1,063 additions and 1,132 deletions.
diff --git a/posthog/hogql/grammar/HogQLParser.g4 b/posthog/hogql/grammar/HogQLParser.g4
@@ -21,7 +21,6 @@ selectStmt:
     groupByClause? (WITH (CUBE | ROLLUP))? (WITH TOTALS)?
     havingClause?
     orderByClause?
-    limitByClause?
     limitClause?
     settingsClause?
     ;
@@ -37,8 +36,7 @@ groupByClause: GROUP BY ((CUBE | ROLLUP) LPAREN columnExprList RPAREN | columnEx
 havingClause: HAVING columnExpr;
 orderByClause: ORDER BY orderExprList;
 projectionOrderByClause: ORDER BY columnExprList;
-limitByClause: LIMIT limitExpr BY columnExprList;
-limitClause: LIMIT limitExpr (WITH TIES)?;
+limitClause: LIMIT limitExpr ((WITH TIES) | BY columnExprList)?;
 settingsClause: SETTINGS settingExprList;
 
 joinExpr

diff --git a/posthog/hogql/grammar/HogQLParser.interp b/posthog/hogql/grammar/HogQLParser.interp