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 branch 'dev' of https://github.com/umami-software/umami into dev

Browse source
This commit is contained in:
Francis Cao 2025-02-12 09:51:53 -08:00
commit 28f15a9173
7 changed files with 23 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/queries/sql/sessions/getSessionDataProperties.ts
View file

@ -24,13 +24,16 @@ async function relationalQuery(
return rawQuery(
`
select
data_key as "propertyName",
count(*) as "total"
from session_data
where website_id = {{websiteId::uuid}}
and created_at between {{startDate}} and {{endDate}}
${filterQuery}
group by data_key
data_key as "propertyName",
count(*) as "total"
from website_event e
left join session_data d
on d.session_id = e.session_id
where e.website_id = {{websiteId:uuid}}
and e.created_at between {{startDate}} and {{endDate}}
and d.data_key is not null
${filterQuery}
group by 1
order by 2 desc
limit 500
`,
@ -52,11 +55,14 @@ async function clickhouseQuery(
select
data_key as propertyName,
count(*) as total
from session_data final
where website_id = {websiteId:UUID}
and created_at between {startDate:DateTime64} and {endDate:DateTime64}
from website_event e
left join session_data d
on d.session_id = e.session_id
where e.website_id = {websiteId:UUID}
and e.created_at between {startDate:DateTime64} and {endDate:DateTime64}
and d.data_key != ''
${filterQuery}
group by data_key
group by 1
order by 2 desc
limit 500
`,