hogql-parser 1.2.10__tar.gz → 1.2.11__tar.gz

{hogql_parser-1.2.10 → hogql_parser-1.2.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hogql_parser
-Version: 1.2.10
+Version: 1.2.11
 Summary: HogQL parser for internal PostHog use
 Home-page: https://github.com/PostHog/posthog/tree/master/common/hogql_parser
 Author: PostHog Inc.

{hogql_parser-1.2.10 → hogql_parser-1.2.11}/hogql_parser.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hogql_parser
-Version: 1.2.10
+Version: 1.2.11
 Summary: HogQL parser for internal PostHog use
 Home-page: https://github.com/PostHog/posthog/tree/master/common/hogql_parser
 Author: PostHog Inc.

{hogql_parser-1.2.10 → hogql_parser-1.2.11}/parser.cpp

@@ -1152,7 +1152,7 @@ class HogQLParseTreeConverter : public HogQLParserBaseVisitor {
     if (!limit_expr_result) {
       throw ParsingError("Failed to parse limitExpr");
     }
-    
+
     PyObject* exprs = visitAsPyObject(ctx->columnExprList());
     if (!exprs) {
       Py_DECREF(limit_expr_result);
@@ -1161,7 +1161,7 @@ class HogQLParseTreeConverter : public HogQLParserBaseVisitor {
 
     PyObject* n = NULL;
     PyObject* offset_value = NULL;
-    
+
     // Check if it's a tuple
     if (PyTuple_Check(limit_expr_result)) {
       if (PyTuple_Size(limit_expr_result) >= 2) {
@@ -1180,7 +1180,7 @@ class HogQLParseTreeConverter : public HogQLParserBaseVisitor {
       n = limit_expr_result;
       offset_value = Py_NewRef(Py_None);
     }
-    
+
     // Create the LimitByExpr node (transfers ownership of n, offset_value, and exprs)
     RETURN_NEW_AST_NODE("LimitByExpr", "{s:N,s:N,s:N}",
                        "n", n,
@@ -1212,7 +1212,7 @@ class HogQLParseTreeConverter : public HogQLParserBaseVisitor {
       Py_DECREF(second);
       throw PyInternalError();
     }
-    
+
     if (ctx->COMMA()) {
       // For "LIMIT a, b" syntax: a is offset, b is limit
       // PyTuple_SET_ITEM steals references, so we don't need to DECREF after
@@ -2014,7 +2014,7 @@ class HogQLParseTreeConverter : public HogQLParserBaseVisitor {
     }
 
     PyObject* ret = build_ast_node(
-      "Call", 
+      "Call",
       "{s:s,s:[O]}",  // s:[O] means "args" => [the single PyObject]
       "name", name.c_str(),
       "args", constant_count
@@ -2125,13 +2125,12 @@ class HogQLParseTreeConverter : public HogQLParserBaseVisitor {
   }
 
   VISIT(ColumnExprBetween) {
-    // x [NOT] BETWEEN y AND z -> inclusive ends: (x >= y AND x <= z) or NOT: (x < y OR x > z)
-    PyObject* x = visitAsPyObject(ctx->columnExpr(0));
+    PyObject* expr = visitAsPyObject(ctx->columnExpr(0));
     PyObject* low;
     try {
       low = visitAsPyObject(ctx->columnExpr(1));
     } catch (...) {
-      Py_DECREF(x);
+      Py_DECREF(expr);
       throw;
     }
     PyObject* high;
@@ -2139,112 +2138,17 @@ class HogQLParseTreeConverter : public HogQLParserBaseVisitor {
       high = visitAsPyObject(ctx->columnExpr(2));
     } catch (...) {
       Py_DECREF(low);
-      Py_DECREF(x);
+      Py_DECREF(expr);
       throw;
     }
-
-    if (ctx->NOT()) {
-      // (x < low) OR (x > high)
-      PyObject* lt_op = get_ast_enum_member("CompareOperationOp", "Lt");
-      PyObject* gt_op = get_ast_enum_member("CompareOperationOp", "Gt");
-      if (!lt_op || !gt_op) {
-        Py_XDECREF(lt_op);
-        Py_XDECREF(gt_op);
-        Py_DECREF(high);
-        Py_DECREF(low);
-        Py_DECREF(x);
-        throw PyInternalError();
-      }
-      Py_INCREF(x);
-      PyObject* lt = build_ast_node("CompareOperation", "{s:N,s:N,s:N}", "left", x, "right", low, "op", lt_op);
-      if (!lt) {
-        Py_DECREF(gt_op);
-        Py_DECREF(high);
-        Py_DECREF(low);
-        Py_DECREF(x);
-        throw PyInternalError();
-      }
-      Py_INCREF(x);
-      PyObject* gt = build_ast_node("CompareOperation", "{s:N,s:N,s:N}", "left", x, "right", high, "op", gt_op);
-      if (!gt) {
-        Py_DECREF(lt);
-        Py_DECREF(high);
-        Py_DECREF(low);
-        Py_DECREF(x);
-        throw PyInternalError();
-      }
-      PyObject* or_list = Py_BuildValue("[NN]", lt, gt);
-      if (!or_list) {
-        Py_DECREF(gt);
-        Py_DECREF(lt);
-        Py_DECREF(high);
-        Py_DECREF(low);
-        Py_DECREF(x);
-        throw PyInternalError();
-      }
-      PyObject* result = build_ast_node("Or", "{s:N}", "exprs", or_list);
-      if (!result) {
-        Py_DECREF(or_list);
-        Py_DECREF(high);
-        Py_DECREF(low);
-        Py_DECREF(x);
-        throw PyInternalError();
-      }
-      Py_DECREF(x);
-      return result;
-    }
-
-    // (x >= low) AND (x <= high)
-    PyObject* gte_op = get_ast_enum_member("CompareOperationOp", "GtEq");
-    PyObject* lte_op = get_ast_enum_member("CompareOperationOp", "LtEq");
-    if (!gte_op || !lte_op) {
-      Py_XDECREF(gte_op);
-      Py_XDECREF(lte_op);
-      Py_DECREF(high);
-      Py_DECREF(low);
-      Py_DECREF(x);
-      throw PyInternalError();
-    }
-
-    Py_INCREF(x);
-    PyObject* gte = build_ast_node("CompareOperation", "{s:N,s:N,s:N}", "left", x, "right", low, "op", gte_op);
-    if (!gte) {
-      Py_DECREF(lte_op);
-      Py_DECREF(high);
-      Py_DECREF(low);
-      Py_DECREF(x);
-      throw PyInternalError();
-    }
-
-    Py_INCREF(x);
-    PyObject* lte = build_ast_node("CompareOperation", "{s:N,s:N,s:N}", "left", x, "right", high, "op", lte_op);
-    if (!lte) {
-      Py_DECREF(gte);
-      Py_DECREF(high);
-      Py_DECREF(low);
-      Py_DECREF(x);
-      throw PyInternalError();
-    }
-    PyObject* and_list = Py_BuildValue("[NN]", gte, lte);
-    if (!and_list) {
-      Py_DECREF(lte);
-      Py_DECREF(gte);
-      Py_DECREF(high);
-      Py_DECREF(low);
-      Py_DECREF(x);
-      throw PyInternalError();
-    }
-    PyObject* result = build_ast_node("And", "{s:N}", "exprs", and_list);
-    if (!result) {
-      Py_DECREF(and_list);
-      Py_DECREF(high);
-      Py_DECREF(low);
-      Py_DECREF(x);
-      throw PyInternalError();
-    }
-
-    Py_DECREF(x);
-    return result;
+    RETURN_NEW_AST_NODE(
+        "BetweenExpr",
+        "{s:N,s:N,s:N,s:O}",
+        "expr", expr,
+        "low", low,
+        "high", high,
+        "negated", ctx->NOT() ? Py_True : Py_False
+    );
   }
 
   VISIT(ColumnExprParens) { return visit(ctx->columnExpr()); }

{hogql_parser-1.2.10 → hogql_parser-1.2.11}/setup.py

@@ -33,7 +33,7 @@ module = Extension(
 
 setup(
     name="hogql_parser",
-    version="1.2.10",
+    version="1.2.11",
     url="https://github.com/PostHog/posthog/tree/master/common/hogql_parser",
     description="HogQL parser for internal PostHog use",
     author="PostHog Inc.",