WIP: start adding old trends tests against new query runner

PostHog · Nov 10, 2023 · 4b33ada · 4b33ada
1 parent d79002a
commit 4b33ada
Show file tree

Hide file tree

Showing 6 changed files with 8,646 additions and 10 deletions.
diff --git a/posthog/hogql_queries/insights/trends/breakdown.py b/posthog/hogql_queries/insights/trends/breakdown.py
@@ -60,9 +60,10 @@ def column_expr(self) -> ast.Expr:
                 expr=parse_expr(self.query.breakdown.breakdown),
             )
         elif self.query.breakdown.breakdown_type == "cohort":
+            cohort_breakdown = 0 if self.query.breakdown.breakdown == "all" else int(self.query.breakdown.breakdown)
             return ast.Alias(
                 alias="breakdown_value",
-                expr=ast.Constant(value=int(self.query.breakdown.breakdown)),
+                expr=ast.Constant(value=cohort_breakdown),
             )
 
         if self.query.breakdown.breakdown_type == "hogql":
@@ -76,8 +77,11 @@ def column_expr(self) -> ast.Expr:
             expr=ast.Field(chain=self._properties_chain),
         )
 
-    def events_where_filter(self) -> ast.Expr:
+    def events_where_filter(self) -> ast.Expr | None:
         if self.query.breakdown.breakdown_type == "cohort":
+            if self.query.breakdown.breakdown == "all":
+                return None
+
             return ast.CompareOperation(
                 left=ast.Field(chain=["person_id"]),
                 op=ast.CompareOperationOp.InCohort,

diff --git a/posthog/hogql_queries/insights/trends/breakdown_values.py b/posthog/hogql_queries/insights/trends/breakdown_values.py
@@ -36,6 +36,9 @@ def __init__(
 
     def get_breakdown_values(self) -> List[str | int]:
         if self.breakdown_type == "cohort":
+            if self.breakdown_field == "all":
+                return [0]
+
             return [int(self.breakdown_field)]
 
         if self.breakdown_type == "hogql":

diff --git a/posthog/hogql_queries/insights/trends/display.py b/posthog/hogql_queries/insights/trends/display.py
@@ -26,11 +26,7 @@ def should_wrap_inner_query(self) -> bool:
         return self.display_type == ChartDisplayType.ActionsLineGraphCumulative
 
     def modify_outer_query(self, outer_query: ast.SelectQuery, inner_query: ast.SelectQuery) -> ast.SelectQuery:
-        if (
-            self.display_type == ChartDisplayType.BoldNumber
-            or self.display_type == ChartDisplayType.ActionsPie
-            or self.display_type == ChartDisplayType.WorldMap
-        ):
+        if self.should_aggregate_values():
             return ast.SelectQuery(
                 select=[
                     ast.Alias(

diff --git a/posthog/hogql_queries/insights/trends/query_builder.py b/posthog/hogql_queries/insights/trends/query_builder.py
@@ -280,7 +280,9 @@ def _events_filter(self) -> ast.Expr:
 
         # Breakdown
         if self._breakdown.enabled and not self._breakdown.is_histogram_breakdown:
-            filters.append(self._breakdown.events_where_filter())
+            breakdown_filter = self._breakdown.events_where_filter()
+            if breakdown_filter is not None:
+                filters.append(breakdown_filter)
 
         if len(filters) == 0:
             return ast.Constant(value=True)