From aea373ca56a1730c3a54f706ffc0ed92f0023b0a Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Mon, 23 Mar 2026 16:22:06 -0700
Subject: [PATCH] fix EventDataValues query

---
 src/queries/sql/events/getEventDataEvents.ts | 10 +++++++---
 src/queries/sql/events/getEventDataValues.ts |  1 -
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/queries/sql/events/getEventDataEvents.ts b/src/queries/sql/events/getEventDataEvents.ts
index 8ed6633ea..f415e629d 100644
--- a/src/queries/sql/events/getEventDataEvents.ts
+++ b/src/queries/sql/events/getEventDataEvents.ts
@@ -25,7 +25,7 @@ export async function getEventDataEvents(
 async function relationalQuery(websiteId: string, filters: QueryFilters) {
   const { rawQuery, parseFilters } = prisma;
   const { event } = filters;
-  const { queryParams } = parseFilters({
+  const { filterQuery, cohortQuery, joinSessionQuery, queryParams } = parseFilters({
     ...filters,
     websiteId,
   });
@@ -42,9 +42,11 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
       from event_data
       inner join website_event
         on website_event.event_id = event_data.website_event_id
+      ${cohortQuery}
+      ${joinSessionQuery}
       where event_data.website_id = {{websiteId::uuid}}
         and event_data.created_at between {{startDate}} and {{endDate}}
-        and website_event.event_name = {{event}}
+      ${filterQuery}
       group by website_event.event_name, event_data.data_key, event_data.data_type, event_data.string_value
       order by 1 asc, 2 asc, 3 asc, 5 desc
       `,
@@ -63,8 +65,11 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
     from event_data
     inner join website_event
       on website_event.event_id = event_data.website_event_id
+    ${cohortQuery}
+    ${joinSessionQuery}
     where event_data.website_id = {{websiteId::uuid}}
       and event_data.created_at between {{startDate}} and {{endDate}}
+    ${filterQuery}
     limit 500
     `,
     queryParams,
@@ -105,7 +110,6 @@ async function clickhouseQuery(
       ${cohortQuery}
       where event_data.website_id = {websiteId:UUID}
         and event_data.created_at between {startDate:DateTime64} and {endDate:DateTime64}
-        and event_data.event_name = {event:String}
       ${filterQuery}
       group by data_key, data_type, string_value, event_name
       order by 1 asc, 2 asc, 3 asc, 5 desc
diff --git a/src/queries/sql/events/getEventDataValues.ts b/src/queries/sql/events/getEventDataValues.ts
index 7c1ae282e..f644934e3 100644
--- a/src/queries/sql/events/getEventDataValues.ts
+++ b/src/queries/sql/events/getEventDataValues.ts
@@ -85,7 +85,6 @@ async function clickhouseQuery(
     where event_data.website_id = {websiteId:UUID}
       and event_data.created_at between {startDate:DateTime64} and {endDate:DateTime64}
       and event_data.data_key = {propertyName:String}
-      and event_data.event_name = {event:String}
     ${filterQuery}
     group by value
     order by 2 desc