Skip to content

armgit / umami

Public Imported from GitHub
0

Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.

fix ambiguous query errors. Closes #4176

Francis Caoe58131cb72b0
diff --git a/src/queries/sql/replays/getSessionReplays.ts b/src/queries/sql/replays/getSessionReplays.ts
index d7e1535b6..8678f21b1 100644
--- a/src/queries/sql/replays/getSessionReplays.ts
+++ b/src/queries/sql/replays/getSessionReplays.ts
@@ -17,7 +17,7 @@ export function getSessionReplays(
async function relationalQuery(websiteId: string, filters: QueryFilters, sessionId?: string) {
const { pagedRawQuery, parseFilters } = prisma;
const { search } = filters;
- const { filterQuery, cohortQuery, queryParams } = parseFilters({
+ const { filterQuery, cohortQuery, queryParams, joinSessionQuery } = parseFilters({
...filters,
websiteId,
search: search ? `%${search}%` : undefined,
@@ -27,6 +27,7 @@ async function relationalQuery(websiteId: string, filters: QueryFilters, session
filterQuery || cohortQuery
? `join (select distinct website_event.website_id, website_event.session_id, website_event.visit_id
from website_event
+ ${joinSessionQuery}
${cohortQuery}
where website_event.website_id = {{websiteId::uuid}}
and website_event.created_at between {{startDate}} and {{endDate}}
diff --git a/src/queries/sql/reports/getPerformance.ts b/src/queries/sql/reports/getPerformance.ts
index 9aaaffd9d..1abe9c54a 100644
--- a/src/queries/sql/reports/getPerformance.ts
+++ b/src/queries/sql/reports/getPerformance.ts
@@ -47,7 +47,7 @@ async function relationalQuery(
const chart = await rawQuery(
`
select
- ${getDateSQL('created_at', unit, timezone)} t,
+ ${getDateSQL('website_event.created_at', unit, timezone)} t,
percentile_cont(0.5) within group (order by ${metric}) as p50,
percentile_cont(0.75) within group (order by ${metric}) as p75,
percentile_cont(0.95) within group (order by ${metric}) as p95