Update funnel_correlation.py

PostHog · Jun 20, 2024 · d4660e3 · d4660e3
1 parent 04e101a
commit d4660e3
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/ee/clickhouse/queries/funnels/funnel_correlation.py b/ee/clickhouse/queries/funnels/funnel_correlation.py
@@ -499,12 +499,18 @@ def _get_aggregation_join_query(self):
             return GroupsJoinQuery(self._filter, self._team.pk, join_key="funnel_actors.actor_id").get_join_query()
 
     def _get_properties_prop_clause(self):
-        group_properties_field = f"groups_{self._filter.aggregation_group_type_index}.group_properties_{self._filter.aggregation_group_type_index}"
-        aggregation_properties_alias = (
-            PersonQuery.PERSON_PROPERTIES_ALIAS
-            if self._filter.aggregation_group_type_index is None
-            else group_properties_field
-        )
+        if (
+            alias_poe_mode_for_legacy(self._team.person_on_events_mode) != PersonsOnEventsMode.DISABLED
+            and self._filter.aggregation_group_type_index is None
+        ):
+            aggregation_properties_alias = "person_properties"
+        else:
+            group_properties_field = f"groups_{self._filter.aggregation_group_type_index}.group_properties_{self._filter.aggregation_group_type_index}"
+            aggregation_properties_alias = (
+                PersonQuery.PERSON_PROPERTIES_ALIAS
+                if self._filter.aggregation_group_type_index is None
+                else group_properties_field
+            )
 
         if "$all" in cast(list, self._filter.correlation_property_names):
             return (