Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.
TypeScript analyticsaudience-segmentationchartscohort-analysisgoogle-analyticsproduct-analyticsstatisticsuser-journeyweb-analytics
Formatting.
Mike Cao0cc289b3cd50
diff --git a/lib/prisma.ts b/lib/prisma.tsindex 9b02b31bc..427578d60 100644--- a/lib/prisma.ts+++ b/lib/prisma.ts@@ -103,6 +103,7 @@ async function rawQuery(sql: string, data: object): Promise<any> {if (db !== POSTGRESQL && db !== MYSQL) {return Promise.reject(new Error('Unknown database.'));}+const query = sql?.replaceAll(/\{\{\s*(\w+)(::\w+)?\s*}}/g, (...args) => {const [, name, type] = args;params.push(data[name]);diff --git a/queries/analytics/reports/getFunnel.ts b/queries/analytics/reports/getFunnel.tsindex fcaa93072..3c5c65e09 100644--- a/queries/analytics/reports/getFunnel.ts+++ b/queries/analytics/reports/getFunnel.ts@@ -78,15 +78,18 @@ async function relationalQuery(}return rawQuery(- `WITH level1 AS (+ `+ WITH level1 AS (select distinct session_id, created_atfrom website_eventwhere website_id = {{websiteId::uuid}}- and created_at between {{startDate}} and {{endDate}}- and url_path = {{0}})+ and created_at between {{startDate}} and {{endDate}}+ and url_path = {{0}}+ )${levelQuery}${sumQuery}- ORDER BY level;`,+ ORDER BY level;+ `,{websiteId,startDate,@@ -97,7 +100,7 @@ async function relationalQuery(return urls.map((a, i) => ({x: a,y: results[i]?.count || 0,- z: (1 - (Number(results[i]?.count) * 1.0) / Number(results[i - 1]?.count)) * 100 || 0, // drop off+ z: (1 - Number(results[i]?.count) / Number(results[i - 1]?.count)) * 100 || 0, // drop off}));});}@@ -173,17 +176,20 @@ async function clickhouseQuery(select distinct session_id, url_path, referrer_path, created_atfrom umami.website_eventwhere url_path in (${urlFilterQuery})- and website_id = {websiteId:UUID}- and created_at between {startDate:DateTime64} and {endDate:DateTime64}- ), level1 AS (+ and website_id = {websiteId:UUID}+ and created_at between {startDate:DateTime64} and {endDate:DateTime64}+ ),+ level1 AS (select *from level0- where url_path = {url0:String})+ where url_path = {url0:String}+ )${levelQuery}select *from (- ${sumQuery}- ) ORDER BY level;`,+ ${sumQuery}+ ) ORDER BY level;+ `,{websiteId,startDate,@@ -194,7 +200,7 @@ async function clickhouseQuery(return urls.map((a, i) => ({x: a,y: results[i]?.count || 0,- z: (1 - (Number(results[i]?.count) * 1.0) / Number(results[i - 1]?.count)) * 100 || 0, // drop off+ z: (1 - Number(results[i]?.count) / Number(results[i - 1]?.count)) * 100 || 0, // drop off}));});}