watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2025-12-08 05:12:36 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

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

7
queries/analytics/event/getEventMetrics.js
View file

@ -10,7 +10,7 @@ export async function getEventMetrics(...args) {
}
async function relationalQuery(
website_id,
websiteId,
start_at,
end_at,
timezone = 'utc',
@ -18,7 +18,7 @@ async function relationalQuery(
filters = {},
) {
const { rawQuery, getDateQuery, getFilterQuery } = prisma;
const params = [website_id, start_at, end_at];
const params = [websiteId, start_at, end_at];
return rawQuery(
`select
@ -36,6 +36,7 @@ async function relationalQuery(
}
async function clickhouseQuery(
websiteId,
website_uuid,
start_at,
end_at,
@ -44,7 +45,7 @@ async function clickhouseQuery(
filters = {},
) {
const { rawQuery, getDateQuery, getBetweenDates, getFilterQuery } = clickhouse;
const params = [website_uuid];
const params = [websiteId];
return rawQuery(
`select