github/umami
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
Mike Cao
2025-11-14 15:46:59 -08:00
parent cb63e49a9b d382ad2975
commit 1852acc333
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/queries/sql/reports/getJourney.ts
View File

@@ -73,7 +73,7 @@ async function relationalQuery(
for (let i = 1; i <= steps; i++) { for (let i = 1; i <= steps; i++) {
const endQuery = i < steps ? ',' : ''; const endQuery = i < steps ? ',' : '';
selectQuery += `s.e${i},`; selectQuery += `s.e${i},`;
maxQuery += `\nmax(CASE WHEN event_number = ${i} THEN event ELSE NULL END) AS e${i}${endQuery}`; maxQuery += `\nmax(CASE WHEN event_number = ${i} THEN "event" ELSE NULL END) AS e${i}${endQuery}`;
groupByQuery += `s.e${i}${endQuery} `; groupByQuery += `s.e${i}${endQuery} `;
} }
@@ -185,7 +185,7 @@ async function clickhouseQuery(
for (let i = 1; i <= steps; i++) { for (let i = 1; i <= steps; i++) {
const endQuery = i < steps ? ',' : ''; const endQuery = i < steps ? ',' : '';
selectQuery += `s.e${i},`; selectQuery += `s.e${i},`;
maxQuery += `\nmax(CASE WHEN event_number = ${i} THEN event ELSE NULL END) AS e${i}${endQuery}`; maxQuery += `\nmax(CASE WHEN event_number = ${i} THEN "event" ELSE NULL END) AS e${i}${endQuery}`;
groupByQuery += `s.e${i}${endQuery} `; groupByQuery += `s.e${i}${endQuery} `;
} }
@@ -230,7 +230,7 @@ async function clickhouseQuery(
WITH events AS ( WITH events AS (
select distinct select distinct
visit_id, visit_id,
coalesce(nullIf(event_name, ''), url_path) event, coalesce(nullIf(event_name, ''), url_path) "event",
row_number() OVER (PARTITION BY visit_id ORDER BY created_at) AS event_number row_number() OVER (PARTITION BY visit_id ORDER BY created_at) AS event_number
from website_event from website_event
${cohortQuery} ${cohortQuery}