watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-10 23:57:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Re-write CH queries to use query params.

Browse source
This commit is contained in:
Brian Cao 2023-01-12 00:02:12 -08:00
parent b4bd988e4e
commit 1eb9e10d94
12 changed files with 81 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

6
queries/analytics/stats/getWebsiteStats.ts
View file

@ -52,7 +52,7 @@ async function clickhouseQuery(
const { startDate, endDate, filters = {} } = data;
const { rawQuery, getDateQuery, getBetweenDates, parseFilters } = clickhouse;
const website = await cache.fetchWebsite(websiteId);
const params = [websiteId, website?.revId || 0];
const params = { websiteId, revId: website?.revId || 0 };
const { filterQuery } = parseFilters(filters, params);
return rawQuery(
@ -69,8 +69,8 @@ async function clickhouseQuery(
max(created_at) max_time
from event
where event_type = ${EVENT_TYPE.pageView}
and website_id = $1
and rev_id = $2
and website_id = {websiteId:UUID}
and rev_id = {revId:UInt32}
and ${getBetweenDates('created_at', startDate, endDate)}
${filterQuery}
group by session_id, time_series