Merge branch 'dev' of https://github.com/umami-software/umami into bug/um-200-fix-referrer-filters

This commit is contained in:
Francis Cao 2023-03-15 16:40:13 -07:00
commit 790e71cc14
14 changed files with 117 additions and 179 deletions

View file

@ -50,7 +50,7 @@ async function relationalQuery(
const { filterQuery, joinSession } = parseFilters(filters, params);
return rawQuery(
`select ${getDateQuery('website_event.created_at', unit, timezone)} t,
`select ${getDateQuery('website_event.created_at', unit, timezone)} x,
count(${count !== '*' ? `${count}${sessionKey}` : count}) y
from website_event
${joinSession}
@ -83,7 +83,7 @@ async function clickhouseQuery(
return rawQuery(
`select
${getDateStringQuery('g.t', unit)} as t,
${getDateStringQuery('g.t', unit)} as x,
g.y as y
from
(select