Merge branch 'analytics' of https://github.com/umami-software/umami into dev

This commit is contained in:
Francis Cao 2024-08-19 09:37:49 -07:00
commit 66510fd441
3 changed files with 3 additions and 3 deletions

View File

@ -32,7 +32,7 @@ async function clickhouseQuery(websiteId: string, sessionId: string) {
number_value as numberValue, number_value as numberValue,
date_value as dateValue, date_value as dateValue,
created_at as createdAt created_at as createdAt
from session_data from session_data final
where website_id = {websiteId:UUID} where website_id = {websiteId:UUID}
and session_id = {sessionId:UUID} and session_id = {sessionId:UUID}
order by data_key asc order by data_key asc

View File

@ -52,7 +52,7 @@ async function clickhouseQuery(
select select
data_key as propertyName, data_key as propertyName,
count(*) as total count(*) as total
from session_data from session_data final
where website_id = {websiteId:UUID} where website_id = {websiteId:UUID}
and created_at between {startDate:DateTime64} and {endDate:DateTime64} and created_at between {startDate:DateTime64} and {endDate:DateTime64}
${filterQuery} ${filterQuery}

View File

@ -51,7 +51,7 @@ async function clickhouseQuery(
data_type = 4, toString(date_trunc('hour', date_value)), data_type = 4, toString(date_trunc('hour', date_value)),
string_value) as "value", string_value) as "value",
count(*) as "total" count(*) as "total"
from session_data from session_data final
where website_id = {websiteId:UUID} where website_id = {websiteId:UUID}
and created_at between {startDate:DateTime64} and {endDate:DateTime64} and created_at between {startDate:DateTime64} and {endDate:DateTime64}
and data_key = {propertyName:String} and data_key = {propertyName:String}