WIP

posthog/hogql/database/database.py

@@ -53,6 +53,7 @@
 from posthog.hogql.database.schema.person_distinct_ids import (
     PersonDistinctIdsTable,
     RawPersonDistinctIdsTable,
+    join_with_person_distinct_ids_table,
 )
 from posthog.hogql.database.schema.persons import (
     PersonsTable,
@@ -457,6 +458,15 @@
                 ),
             )
 
+            if "events" in join.joining_table_name and join.configuration.get("experiments_optimized"):
+                source_table.fields["pdi"] = LazyJoin(
+                    from_field=from_field,
+                    join_table=PersonDistinctIdsTable(),
+                    join_function=join_with_person_distinct_ids_table,
+                    override_source_table_key=join.source_table_key,
+                )
+                source_table.fields["person"] = FieldTraverser(chain=["pdi", "person"])
+
             if join.source_table_name == "persons":
                 person_field = database.events.fields["person"]
                 if isinstance(person_field, ast.FieldTraverser):

posthog/hogql/database/schema/person_distinct_ids.py

@@ -1,3 +1,4 @@
+from typing import Optional
 from posthog.hogql.ast import SelectQuery
 from posthog.hogql.constants import HogQLQuerySettings
 from posthog.hogql.context import HogQLContext
@@ -48,18 +49,20 @@ def join_with_person_distinct_ids_table(
     join_to_add: LazyJoinToAdd,
     context: HogQLContext,
     node: SelectQuery,
+    override_source_table_key: Optional[str] = None,
 ):
     from posthog.hogql import ast
 
     if not join_to_add.fields_accessed:
         raise ResolutionError("No fields requested from person_distinct_ids")
+    source_table_key = override_source_table_key or "distinct_id"
     join_expr = ast.JoinExpr(table=select_from_person_distinct_ids_table(join_to_add.fields_accessed))
     join_expr.join_type = "INNER JOIN"
     join_expr.alias = join_to_add.to_table
     join_expr.constraint = ast.JoinConstraint(
         expr=ast.CompareOperation(
             op=ast.CompareOperationOp.Eq,
-            left=ast.Field(chain=[join_to_add.from_table, "distinct_id"]),
+            left=ast.Field(chain=[join_to_add.from_table, source_table_key]),
             right=ast.Field(chain=[join_to_add.to_table, "distinct_id"]),
         ),
         constraint_type="ON",

posthog/hogql_queries/experiments/test/test_experiment_trends_query_runner.py

@@ -246,15 +246,6 @@ def create_data_warehouse_table_with_usage(self):
             field_name="events",
             configuration={"experiments_optimized": True, "experiments_timestamp_key": "ds"},
         )
-
-        DataWarehouseJoin.objects.create(
-            team=self.team,
-            source_table_name=table_name,
-            source_table_key="userid",
-            joining_table_name="persons",
-            joining_table_key="properties.$user_id",
-            field_name="person",
-        )
         return table_name
 
     @freeze_time("2020-01-01T12:00:00Z")
@@ -869,8 +860,9 @@ def test_query_runner_with_data_warehouse_series_no_end_date_and_nested_id(self)
 
         _create_person(
             team=self.team,
-            distinct_ids=["internal_test_1"],
-            properties={"email": "internal_test_1@posthog.com", "$user_id": "internal_test_1"},
+            uuid="018f14b8-6cf3-7ffd-80bb-5ef1a9e4d328",
+            distinct_ids=["018f14b8-6cf3-7ffd-80bb-5ef1a9e4d328", "internal_test_1"],
+            properties={"email": "internal_test_1@posthog.com"},
         )
 
         _create_event(