fix(hogql): remove unsupported extract(..from..) (#21157)

PostHog · Mar 27, 2024 · a661b4b · a661b4b
1 parent 7cff949
commit a661b4b
Show file tree

Hide file tree

Showing 15 changed files with 1,299 additions and 1,420 deletions.
diff --git a/hogql_parser/HogQLParser.cpp b/hogql_parser/HogQLParser.cpp
diff --git a/hogql_parser/HogQLParser.h b/hogql_parser/HogQLParser.h
@@ -988,20 +988,6 @@ class  HogQLParser : public antlr4::Parser {
     virtual std::any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
   };
 
-  class  ColumnExprExtractContext : public ColumnExprContext {
-  public:
-    ColumnExprExtractContext(ColumnExprContext *ctx);
-
-    antlr4::tree::TerminalNode *EXTRACT();
-    antlr4::tree::TerminalNode *LPAREN();
-    IntervalContext *interval();
-    antlr4::tree::TerminalNode *FROM();
-    ColumnExprContext *columnExpr();
-    antlr4::tree::TerminalNode *RPAREN();
-
-    virtual std::any accept(antlr4::tree::ParseTreeVisitor *visitor) override;
-  };
-
   class  ColumnExprNegateContext : public ColumnExprContext {
   public:
     ColumnExprNegateContext(ColumnExprContext *ctx);

diff --git a/hogql_parser/HogQLParser.interp b/hogql_parser/HogQLParser.interp
diff --git a/hogql_parser/HogQLParserBaseVisitor.h b/hogql_parser/HogQLParserBaseVisitor.h
@@ -211,10 +211,6 @@ class  HogQLParserBaseVisitor : public HogQLParserVisitor {
     return visitChildren(ctx);
   }
 
-  virtual std::any visitColumnExprExtract(HogQLParser::ColumnExprExtractContext *ctx) override {
-    return visitChildren(ctx);
-  }
-
   virtual std::any visitColumnExprNegate(HogQLParser::ColumnExprNegateContext *ctx) override {
     return visitChildren(ctx);
   }

diff --git a/hogql_parser/HogQLParserVisitor.h b/hogql_parser/HogQLParserVisitor.h
@@ -117,8 +117,6 @@ class  HogQLParserVisitor : public antlr4::tree::AbstractParseTreeVisitor {
 
     virtual std::any visitColumnExprAlias(HogQLParser::ColumnExprAliasContext *context) = 0;
 
-    virtual std::any visitColumnExprExtract(HogQLParser::ColumnExprExtractContext *context) = 0;
-
     virtual std::any visitColumnExprNegate(HogQLParser::ColumnExprNegateContext *context) = 0;
 
     virtual std::any visitColumnExprSubquery(HogQLParser::ColumnExprSubqueryContext *context) = 0;

diff --git a/hogql_parser/parser.cpp b/hogql_parser/parser.cpp
@@ -1082,8 +1082,6 @@ class HogQLParseTreeConverter : public HogQLParserBaseVisitor {
     RETURN_NEW_AST_NODE("Alias", "{s:N,s:s#}", "expr", expr, "alias", alias.data(), alias.size());
   }
 
-  VISIT_UNSUPPORTED(ColumnExprExtract)
-
   VISIT(ColumnExprNegate) {
     PyObject* left = build_ast_node("Constant", "{s:i}", "value", 0);
     if (!left) throw PyInternalException();

diff --git a/hogql_parser/setup.py b/hogql_parser/setup.py
@@ -32,7 +32,7 @@
 
 setup(
     name="hogql_parser",
-    version="1.0.3",
+    version="1.0.4",
     url="https://github.com/PostHog/posthog/tree/master/hogql_parser",
     author="PostHog Inc.",
     author_email="[email protected]",

diff --git a/posthog/hogql/grammar/HogQLParser.g4 b/posthog/hogql/grammar/HogQLParser.g4
@@ -103,7 +103,7 @@ columnExpr
     : CASE caseExpr=columnExpr? (WHEN whenExpr=columnExpr THEN thenExpr=columnExpr)+ (ELSE elseExpr=columnExpr)? END          # ColumnExprCase
     | CAST LPAREN columnExpr AS columnTypeExpr RPAREN                                     # ColumnExprCast
     | DATE STRING_LITERAL                                                                 # ColumnExprDate
-    | EXTRACT LPAREN interval FROM columnExpr RPAREN                                      # ColumnExprExtract
+//    | EXTRACT LPAREN interval FROM columnExpr RPAREN                                      # ColumnExprExtract   // Interferes with a function call
     | INTERVAL columnExpr interval                                                        # ColumnExprInterval
     | SUBSTRING LPAREN columnExpr FROM columnExpr (FOR columnExpr)? RPAREN                # ColumnExprSubstring
     | TIMESTAMP STRING_LITERAL                                                            # ColumnExprTimestamp

diff --git a/posthog/hogql/grammar/HogQLParser.interp b/posthog/hogql/grammar/HogQLParser.interp
diff --git a/posthog/hogql/grammar/HogQLParser.py b/posthog/hogql/grammar/HogQLParser.py
diff --git a/posthog/hogql/grammar/HogQLParserVisitor.py b/posthog/hogql/grammar/HogQLParserVisitor.py
@@ -254,11 +254,6 @@ def visitColumnExprAlias(self, ctx:HogQLParser.ColumnExprAliasContext):
         return self.visitChildren(ctx)
 
 
-    # Visit a parse tree produced by HogQLParser#ColumnExprExtract.
-    def visitColumnExprExtract(self, ctx:HogQLParser.ColumnExprExtractContext):
-        return self.visitChildren(ctx)
-
-
     # Visit a parse tree produced by HogQLParser#ColumnExprNegate.
     def visitColumnExprNegate(self, ctx:HogQLParser.ColumnExprNegateContext):
         return self.visitChildren(ctx)

diff --git a/posthog/hogql/parser.py b/posthog/hogql/parser.py
@@ -499,9 +499,6 @@ def visitColumnExprAlias(self, ctx: HogQLParser.ColumnExprAliasContext):
 
         return ast.Alias(expr=expr, alias=alias)
 
-    def visitColumnExprExtract(self, ctx: HogQLParser.ColumnExprExtractContext):
-        raise NotImplementedException(f"Unsupported node: ColumnExprExtract")
-
     def visitColumnExprNegate(self, ctx: HogQLParser.ColumnExprNegateContext):
         return ast.ArithmeticOperation(
             op=ast.ArithmeticOperationOp.Sub,

diff --git a/posthog/hogql/test/_test_parser.py b/posthog/hogql/test/_test_parser.py
@@ -1594,4 +1594,17 @@ def test_visit_hogqlx_tag_source(self):
                 ],
             )
 
+        def test_select_extract_as_function(self):
+            node = self._select("select extract('string', 'other string') from events")
+
+            assert node == ast.SelectQuery(
+                select=[
+                    ast.Call(
+                        name="extract",
+                        args=[ast.Constant(value="string"), ast.Constant(value="other string")],
+                    )
+                ],
+                select_from=ast.JoinExpr(table=ast.Field(chain=["events"])),
+            )
+
     return TestParser
diff --git a/requirements.in b/requirements.in
@@ -101,5 +101,5 @@ phonenumberslite==8.13.6
 openai==1.10.0
 tiktoken==0.6.0
 nh3==0.2.14
-hogql-parser==1.0.3
+hogql-parser==1.0.4
 urllib3[secure,socks]==1.26.18
diff --git a/requirements.txt b/requirements.txt
@@ -291,7 +291,7 @@ h11==0.13.0
     #   wsproto
 hexbytes==1.0.0
     # via dlt
-hogql-parser==1.0.3
+hogql-parser==1.0.4
     # via -r requirements.in
 httpcore==1.0.2
     # via httpx