merge

PostHog · Dec 4, 2024 · bc0bcad · bc0bcad
1 parent 5e9ae64
commit bc0bcad
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/posthog/hogql/functions/mapping.py b/posthog/hogql/functions/mapping.py
@@ -432,6 +432,7 @@ def compare_types(arg_types: list[ConstantType], sig_arg_types: tuple[ConstantTy
             ((DateTimeType(), StringType()), StringType()),
         ],
     ),
+    "toBool": HogQLFunctionMeta("toBool", 1, 1),
     "toJSONString": HogQLFunctionMeta("toJSONString", 1, 1),
     "parseDateTime": HogQLFunctionMeta("parseDateTimeOrNull", 2, 3, tz_aware=True),
     "parseDateTimeBestEffort": HogQLFunctionMeta("parseDateTime64BestEffortOrNull", 1, 2, tz_aware=True),

diff --git a/posthog/hogql/transforms/property_types.py b/posthog/hogql/transforms/property_types.py
@@ -221,12 +221,17 @@ def _field_type_to_property_call(self, node: ast.Field, field_type: str):
             return ast.Call(name="toFloat", args=[node])
         if field_type == "Boolean":
             return ast.Call(
-                name="transform",
+                name="toBool",
                 args=[
-                    ast.Call(name="toString", args=[node]),
-                    ast.Constant(value=["true", "false"]),
-                    ast.Constant(value=[True, False]),
-                    ast.Constant(value=None),
+                    ast.Call(
+                        name="transform",
+                        args=[
+                            ast.Call(name="toString", args=[node]),
+                            ast.Constant(value=["true", "false"]),
+                            ast.Constant(value=[1, 0]),
+                            ast.Constant(value=None),
+                        ],
+                    )
                 ],
             )
         return node

diff --git a/posthog/hogql_queries/insights/funnels/base.py b/posthog/hogql_queries/insights/funnels/base.py
@@ -37,7 +37,7 @@
 )
 from posthog.types import EntityNode, ExclusionEntityNode
 
-JOIN_ALGOS = "direct,parallel_hash,hash,full_sorting_merge"
+JOIN_ALGOS = "auto"
 
 
 class FunnelBase(ABC):