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 pull request #3682 from rkoh-rq/patch-1
Some checks are pending
Node.js CI / build (postgresql, 18.18, 10) (push) Waiting to run
Details

Browse source 
fix: quote "event" reserved keyword in journey queries
This commit is contained in:
Mike Cao 2025-11-14 11:44:31 -08:00 • committed by GitHub
commit d382ad2975
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
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}