:hedgehog: PostHog is the leading platform for building self-driving products. Our developer tools – AI observability, analytics, session replay, flags, experiments, error tracking, logs, and more – capture all the context agents need to diagnose problems, uncover opportunities, and ship fixes. Steer it all from Slack, web, desktop, or the MCP.
Python ab-testingai-analyticsanalyticscdpdata-warehouseexperimentsfeature-flagsjavascriptproduct-analyticspythonreactsession-replaysurveystypescriptweb-analytics
fix(event-definitions): qualify enterprise columns in the definition list SQL (#126733)
Thomas Obermüller1051e03d4e5e
diff --git a/ee/api/test/test_event_definition.py b/ee/api/test/test_event_definition.pyindex 23da5e285306..b92f0756a67f 100644--- a/ee/api/test/test_event_definition.py+++ b/ee/api/test/test_event_definition.py@@ -5,6 +5,7 @@ import time_machinefrom posthog.test.base import APIBaseTestfrom unittest.mock import patch+from django.db import connectionfrom django.utils import timezoneimport dateutil.parser@@ -710,6 +711,24 @@ class TestEventDefinitionEnterpriseAPI(APIBaseTest):event.refresh_from_db()assert event.owner is None+ def test_list_filters_stay_unambiguous_when_both_tables_have_the_columns(self):+ License.objects.create(key="test_key", plan="enterprise", valid_until=datetime(2500, 1, 19, 3, 14, 7))+ EnterpriseEventDefinition.objects.create(team=self.demo_team, name="checkout_completed", verified=True)+ with connection.cursor() as cursor:+ # Run the deferred FK checks of the inserts above, or Postgres refuses the ALTER TABLE.+ cursor.execute("SET CONSTRAINTS ALL IMMEDIATE")+ cursor.execute(+ "ALTER TABLE posthog_eventdefinition ADD COLUMN IF NOT EXISTS description text,"+ " ADD COLUMN IF NOT EXISTS verified boolean, ADD COLUMN IF NOT EXISTS hidden boolean"+ )++ response = self.client.get(+ "/api/projects/@current/event_definitions/?verified=true&exclude_hidden=true&search=checkout_completed"+ )++ assert response.status_code == status.HTTP_200_OK+ assert [row["name"] for row in response.json()["results"]] == ["checkout_completed"]+def test_cannot_assign_owner_from_another_organization(self):"""Owner must belong to the current organization (PATCH)."""License.objects.create(key="test_key", plan="enterprise", valid_until=datetime(2500, 1, 19, 3, 14, 7))diff --git a/ee/api/test/test_property_definition.py b/ee/api/test/test_property_definition.pyindex 218c93637265..6678afa5acfe 100644--- a/ee/api/test/test_property_definition.py+++ b/ee/api/test/test_property_definition.py@@ -5,6 +5,7 @@ import pytestimport time_machinefrom posthog.test.base import APIBaseTest+from django.db import connectionfrom django.db.utils import IntegrityErrorfrom django.utils import timezone@@ -502,6 +503,26 @@ class TestPropertyDefinitionEnterpriseAPI(APIBaseTest):assert response.json()["verified_by"] is Noneassert response.json()["verified_at"] is None+ def test_list_filters_stay_unambiguous_when_both_tables_have_the_columns(self):+ super(LicenseManager, cast(LicenseManager, License.objects)).create(+ plan="enterprise", valid_until=datetime.datetime(2500, 1, 19, 3, 14, 7)+ )+ EnterprisePropertyDefinition.objects.create(team=self.team, name="billing_plan_tier", verified=True)+ with connection.cursor() as cursor:+ # Run the deferred FK checks of the inserts above, or Postgres refuses the ALTER TABLE.+ cursor.execute("SET CONSTRAINTS ALL IMMEDIATE")+ cursor.execute(+ "ALTER TABLE posthog_propertydefinition ADD COLUMN IF NOT EXISTS description text,"+ " ADD COLUMN IF NOT EXISTS verified boolean, ADD COLUMN IF NOT EXISTS hidden boolean"+ )++ response = self.client.get(+ "/api/projects/@current/property_definitions/?verified=true&exclude_hidden=true&search=billing_plan_tier"+ )++ assert response.status_code == status.HTTP_200_OK+ assert [row["name"] for row in response.json()["results"]] == ["billing_plan_tier"]+def test_list_property_definitions_verified_ordering(self):super(LicenseManager, cast(LicenseManager, License.objects)).create(plan="enterprise", valid_until=datetime.datetime(2500, 1, 19, 3, 14, 7)diff --git a/posthog/api/event_definition.py b/posthog/api/event_definition.pyindex f322ca9b4721..28d52f9acd44 100644--- a/posthog/api/event_definition.py+++ b/posthog/api/event_definition.py@@ -175,8 +175,9 @@ def create_event_definitions_sql(if order_expressions is None:order_expressions = []+ # Qualified by table, so a column name both joined tables carry stays unambiguous.event_definition_fields = {- f'"{f.column}"'+ f'{f.model._meta.db_table}."{f.column}"'for f in event_definition_model(is_enterprise)._meta.get_fields()if isinstance(f, Field) and f.column is not None and f.column not in ["deprecated_tags", "tags"]}@@ -481,7 +482,9 @@ class EventDefinitionViewSet(exclude_hidden = self.request.GET.get("exclude_hidden", "false").lower() == "true"if exclude_hidden and EE_AVAILABLE:- filter_query += " AND (hidden IS NULL OR hidden = false)"+ filter_query += (+ " AND (ee_enterpriseeventdefinition.hidden IS NULL OR ee_enterpriseeventdefinition.hidden = false)"+ )if exclude_stale:# `last_seen_at` is not indexed: the predicate runs after the project-scoped@@ -496,11 +499,14 @@ class EventDefinitionViewSet(if verified_param is not None:if verified_param.lower() == "true":- filter_query += " AND (verified = true OR posthog_eventdefinition.name = ANY(%(core_events)s))"+ filter_query += (+ " AND (ee_enterpriseeventdefinition.verified = true"+ " OR posthog_eventdefinition.name = ANY(%(core_events)s))"+ )params["core_events"] = CORE_EVENTSelse:filter_query += (- " AND (verified IS NULL OR verified = false)"+ " AND (ee_enterpriseeventdefinition.verified IS NULL OR ee_enterpriseeventdefinition.verified = false)"" AND NOT posthog_eventdefinition.name = ANY(%(core_events)s)")params["core_events"] = CORE_EVENTSdiff --git a/posthog/taxonomy/property_definition_api.py b/posthog/taxonomy/property_definition_api.pyindex aa2b9928f50b..6ef861ef3ab7 100644--- a/posthog/taxonomy/property_definition_api.py+++ b/posthog/taxonomy/property_definition_api.py@@ -394,9 +394,12 @@ class QueryContext:def with_verified_filter(self, verified: Optional[bool], use_enterprise_taxonomy: bool) -> Self:if verified is not None and use_enterprise_taxonomy:if verified:- verified_filter = " AND verified = true"+ verified_filter = " AND ee_enterprisepropertydefinition.verified = true"else:- verified_filter = " AND (verified IS NULL OR verified = false)"+ verified_filter = (+ " AND (ee_enterprisepropertydefinition.verified IS NULL"+ " OR ee_enterprisepropertydefinition.verified = false)"+ )return dataclasses.replace(self,excluded_properties_filter=(@@ -409,7 +412,7 @@ class QueryContext:def with_hidden_filter(self, exclude_hidden: bool, use_enterprise_taxonomy: bool) -> Self:if exclude_hidden and use_enterprise_taxonomy:- hidden_filter = " AND (hidden IS NULL OR hidden = false)"+ hidden_filter = " AND (ee_enterprisepropertydefinition.hidden IS NULL OR ee_enterprisepropertydefinition.hidden = false)"return dataclasses.replace(self,excluded_properties_filter=(@@ -438,7 +441,7 @@ class QueryContext:)def as_sql(self, order_by_verified: bool):- verified_ordering = "verified DESC NULLS LAST," if order_by_verified else ""+ verified_ordering = "ee_enterprisepropertydefinition.verified DESC NULLS LAST," if order_by_verified else ""length_ordering = (f"length({self.property_definition_table}.name) ASC," if self.order_by_search_relevance else "")