watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-04 04:37:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge remote-tracking branch 'origin/analytics' into analytics

Browse source
This commit is contained in:
Mike Cao 2025-10-07 01:55:33 -07:00
commit 5a7c6a9816
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/queries/sql/events/getWebsiteEvents.ts
View file

@ -96,7 +96,7 @@ async function clickhouseQuery(websiteId: string, filters: QueryFilters) {
page_title as pageTitle, page_title as pageTitle,
event_type as eventType, event_type as eventType,
event_name as eventName, event_name as eventName,
event_id IN (SELECT event_id FROM event_data) as hasData event_id IN (SELECT event_id FROM event_data where website_id = {websiteId:UUID}) as hasData
from website_event from website_event
${cohortQuery} ${cohortQuery}
where website_id = {websiteId:UUID} where website_id = {websiteId:UUID}

2
src/queries/sql/sessions/getSessionActivity.ts
View file

@ -57,7 +57,7 @@ async function clickhouseQuery(websiteId: string, sessionId: string, filters: Qu
event_type as eventType, event_type as eventType,
event_name as eventName, event_name as eventName,
visit_id as visitId, visit_id as visitId,
event_id IN (SELECT event_id FROM event_data) AS hasData event_id IN (SELECT event_id FROM event_data where website_id = {websiteId:UUID} and session_id = {sessionId:UUID}) AS hasData
from website_event e from website_event e
where e.website_id = {websiteId:UUID} where e.website_id = {websiteId:UUID}
and e.session_id = {sessionId:UUID} and e.session_id = {sessionId:UUID}