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

Merge branch 'dev' into feat/um-66-update-clickhouse-schema-uuid

Browse source
This commit is contained in:
Brian Cao 2022-10-10 16:20:07 -07:00
commit ec6454aead
65 changed files with 436 additions and 441 deletions
Download patch file Download diff file Expand all files Collapse all files

8
queries/analytics/pageview/getPageviewStats.js
View file

@ -10,7 +10,7 @@ export async function getPageviewStats(...args) {
}
async function relationalQuery(
website_id,
websiteId,
{
start_at,
end_at,
@ -22,7 +22,7 @@ async function relationalQuery(
},
) {
const { getDateQuery, parseFilters, rawQuery } = prisma;
const params = [website_id, start_at, end_at];
const params = [websiteId, start_at, end_at];
const { pageviewQuery, sessionQuery, joinSession } = parseFilters(
'pageview',
null,
@ -45,11 +45,11 @@ async function relationalQuery(
}
async function clickhouseQuery(
website_uuid,
websiteId,
{ start_at, end_at, timezone = 'UTC', unit = 'day', count = '*', filters = {} },
) {
const { parseFilters, rawQuery, getDateStringQuery, getDateQuery, getBetweenDates } = clickhouse;
const params = [website_uuid];
const params = [websiteId];
const { pageviewQuery, sessionQuery } = parseFilters(null, filters, params);
return rawQuery(