feat(hog): trailing commas (#23104)

PostHog · Jun 24, 2024 · 397e4a5 · 397e4a5
1 parent 77cfb17
commit 397e4a5
Show file tree

Hide file tree

Showing 13 changed files with 2,865 additions and 2,597 deletions.
diff --git a/hogql_parser/HogQLParser.cpp b/hogql_parser/HogQLParser.cpp
diff --git a/hogql_parser/HogQLParser.interp b/hogql_parser/HogQLParser.interp
diff --git a/hogql_parser/setup.py b/hogql_parser/setup.py
@@ -32,7 +32,7 @@
 
 setup(
     name="hogql_parser",
-    version="1.0.15",
+    version="1.0.16",
     url="https://github.com/PostHog/posthog/tree/master/hogql_parser",
     author="PostHog Inc.",
     author_email="[email protected]",

diff --git a/hogvm/__tests__/__snapshots__/tuples.hoge b/hogvm/__tests__/__snapshots__/tuples.hoge
@@ -1,4 +1,5 @@
-["_h", 2, "tuple", 0, 2, "print", 1, 35, 33, 1, 33, 2, 33, 3, 44, 3, 2, "print", 1, 35, 33, 1, 32, "2", 33, 3, 44, 3, 2,
+["_h", 2, "tuple", 0, 2, "print", 1, 35, 33, 1, 44, 1, 2, "print", 1, 35, 33, 1, 33, 2, 44, 2, 2, "print", 1, 35, 33, 1,
+33, 2, 44, 2, 2, "print", 1, 35, 33, 1, 33, 2, 33, 3, 44, 3, 2, "print", 1, 35, 33, 1, 32, "2", 33, 3, 44, 3, 2,
 "print", 1, 35, 33, 1, 33, 2, 33, 3, 44, 2, 33, 4, 44, 3, 2, "print", 1, 35, 33, 1, 33, 2, 33, 3, 33, 4, 44, 2, 44, 2,
 33, 5, 44, 3, 2, "print", 1, 35, 33, 1, 33, 2, 33, 3, 44, 3, 36, 0, 33, 1, 45, 2, "print", 1, 35, 33, 1, 33, 2, 33, 3,
 33, 4, 44, 2, 44, 2, 33, 5, 44, 3, 33, 1, 45, 33, 1, 45, 33, 1, 45, 2, "print", 1, 35, 33, 1, 33, 2, 33, 3, 33, 4, 44,

diff --git a/hogvm/__tests__/__snapshots__/tuples.stdout b/hogvm/__tests__/__snapshots__/tuples.stdout
@@ -1,4 +1,7 @@
 tuple()
+tuple(1)
+(1, 2)
+(1, 2)
 (1, 2, 3)
 (1, '2', 3)
 (1, (2, 3), 4)

diff --git a/hogvm/__tests__/arrays.hog b/hogvm/__tests__/arrays.hog
@@ -1,12 +1,12 @@
 print([])
 print([1, 2, 3])
-print([1, '2', 3])
+print([1, '2', 3, ])
 print([1, [2, 3], 4])
 print([1, [2, [3, 4]], 5])
 
 let a := [1, 2, 3]
-print(a[1])
-print([1, 2, 3][1])
-print([1, [2, [3, 4]], 5][1][1][1])
+print(a[1], )
+print([1, 2, 3][1], )
+print([1, [2, [3, 4], ], 5][1][1][1])
 print([1, [2, [3, 4]], 5][1][1][1] + 1)
-print([1, [2, [3, 4]], 5].1.1.1)
+print([1, [2, [3, 4, ], ], 5, ].1.1.1)
diff --git a/hogvm/__tests__/dicts.hog b/hogvm/__tests__/dicts.hog
@@ -7,7 +7,7 @@ print({key: 'value'})
 let key := 3
 print({key: 'value'})
 
-print({'key': 'value'}.key)
+print({'key': 'value', }.key)
 print({'key': 'value'}['key'])
 print({'key': {'otherKey': 'value'}}.key.otherKey)
-print({'key': {'otherKey': 'value'}}['key'].otherKey)
+print({'key': {'otherKey': 'value', } , }['key'].otherKey)
diff --git a/hogvm/__tests__/tuples.hog b/hogvm/__tests__/tuples.hog
@@ -1,10 +1,13 @@
 print(tuple())
+print((1,))
+print((1, 2))
+print((1, 2,))
 print((1, 2, 3))
 print((1, '2', 3))
 print((1, (2, 3), 4))
 print((1, (2, (3, 4)), 5))
 let a := (1, 2, 3)
 print(a[1])
 print((1, (2, (3, 4)), 5)[1][1][1])
-print((1, (2, (3, 4)), 5).1.1.1)
+print((1, (2, (3, 4, ), ), 5, ).1.1.1)
 print((1, (2, (3, 4)), 5)[1][1][1] + 1)
diff --git a/posthog/api/test/batch_exports/test_create.py b/posthog/api/test/batch_exports/test_create.py
@@ -301,7 +301,7 @@ def test_create_batch_export_with_custom_schema(client: HttpClient):
     "invalid_query",
     [
         "SELECT",
-        "SELECT event, FROM events",
+        "SELECT event,, FROM events",
         "SELECT unknown_field FROM events",
         "SELECT event, persons.id FROM events LEFT JOIN persons ON events.person_id = persons.id",
         "SELECT event FROM events UNION ALL SELECT event FROM events",

diff --git a/posthog/hogql/grammar/HogQLParser.g4 b/posthog/hogql/grammar/HogQLParser.g4
@@ -12,7 +12,7 @@ declaration: varDecl | statement ;
 expression: columnExpr;
 
 varDecl: LET identifier ( COLON EQ_SINGLE expression )? ;
-identifierList: identifier (COMMA identifier)*;
+identifierList: identifier (COMMA identifier)* COMMA?;
 
 statement      : returnStmt
                | ifStmt
@@ -39,7 +39,7 @@ emptyStmt      : SEMICOLON ;
 block          : LBRACE declaration* RBRACE ;
 
 kvPair: expression ':' expression ;
-kvPairList: kvPair (COMMA kvPair)* ;
+kvPairList: kvPair (COMMA kvPair)* COMMA?;
 
 
 // SELECT statement
@@ -128,12 +128,12 @@ winFrameBound: (CURRENT ROW | UNBOUNDED PRECEDING | UNBOUNDED FOLLOWING | number
 expr: columnExpr EOF;
 columnTypeExpr
     : identifier                                                                             # ColumnTypeExprSimple   // UInt64
-    | identifier LPAREN identifier columnTypeExpr (COMMA identifier columnTypeExpr)* RPAREN  # ColumnTypeExprNested   // Nested
-    | identifier LPAREN enumValue (COMMA enumValue)* RPAREN                                  # ColumnTypeExprEnum     // Enum
-    | identifier LPAREN columnTypeExpr (COMMA columnTypeExpr)* RPAREN                        # ColumnTypeExprComplex  // Array, Tuple
+    | identifier LPAREN identifier columnTypeExpr (COMMA identifier columnTypeExpr)* COMMA? RPAREN  # ColumnTypeExprNested   // Nested
+    | identifier LPAREN enumValue (COMMA enumValue)* COMMA? RPAREN                                  # ColumnTypeExprEnum     // Enum
+    | identifier LPAREN columnTypeExpr (COMMA columnTypeExpr)* COMMA? RPAREN                        # ColumnTypeExprComplex  // Array, Tuple
     | identifier LPAREN columnExprList? RPAREN                                               # ColumnTypeExprParam    // FixedString(N)
     ;
-columnExprList: columnExpr (COMMA columnExpr)*;
+columnExprList: columnExpr (COMMA columnExpr)* COMMA?;
 columnExpr
     : CASE caseExpr=columnExpr? (WHEN whenExpr=columnExpr THEN thenExpr=columnExpr)+ (ELSE elseExpr=columnExpr)? END          # ColumnExprCase
     | CAST LPAREN columnExpr AS columnTypeExpr RPAREN                                     # ColumnExprCast
@@ -198,11 +198,11 @@ columnExpr
     | columnIdentifier                                                                    # ColumnExprIdentifier
     ;
 
-columnArgList: columnArgExpr (COMMA columnArgExpr)*;
+columnArgList: columnArgExpr (COMMA columnArgExpr)* COMMA?;
 columnArgExpr: columnLambdaExpr | columnExpr;
 columnLambdaExpr:
-    ( LPAREN identifier (COMMA identifier)* RPAREN
-    |        identifier (COMMA identifier)*
+    ( LPAREN identifier (COMMA identifier)* COMMA? RPAREN
+    |        identifier (COMMA identifier)* COMMA?
     )
     ARROW columnExpr
     ;
@@ -218,7 +218,7 @@ hogqlxTagAttribute
     |   identifier
     ;
 
-withExprList: withExpr (COMMA withExpr)*;
+withExprList: withExpr (COMMA withExpr)* COMMA?;
 withExpr
     : identifier AS LPAREN selectUnionStmt RPAREN    # WithExprSubquery
     // NOTE: asterisk and subquery goes before |columnExpr| so that we can mark them as multi-column expressions.
@@ -242,7 +242,7 @@ tableExpr
     ;
 tableFunctionExpr: identifier LPAREN tableArgList? RPAREN;
 tableIdentifier: (databaseIdentifier DOT)? identifier;
-tableArgList: columnExpr (COMMA columnExpr)*;
+tableArgList: columnExpr (COMMA columnExpr)* COMMA?;
 
 // Databases
 

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