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
Fix "name" alias for relational query to be compatible with Postgres 12. Closes #3970
Francis Cao3f173889ea0d
diff --git a/src/queries/sql/events/getEventExpandedMetrics.ts b/src/queries/sql/events/getEventExpandedMetrics.tsindex f03a347df..dec444e8e 100644--- a/src/queries/sql/events/getEventExpandedMetrics.ts+++ b/src/queries/sql/events/getEventExpandedMetrics.ts@@ -58,7 +58,7 @@ async function relationalQuery(sum(${getTimestampDiffSQL('t.min_time', 't.max_time')}) as "totaltime"from (select- ${column} name,+ ${column} as "name",website_event.session_id,website_event.visit_id,count(*) as "c",diff --git a/src/queries/sql/getChannelExpandedMetrics.ts b/src/queries/sql/getChannelExpandedMetrics.tsindex 33640d599..f674d182f 100644--- a/src/queries/sql/getChannelExpandedMetrics.ts+++ b/src/queries/sql/getChannelExpandedMetrics.ts@@ -89,7 +89,7 @@ async function relationalQuery(when ${toPostgresPositionClause('referrer_domain', EMAIL_DOMAINS)} or utm_medium ilike '%mail%' then 'email'when ${toPostgresPositionClause('referrer_domain', SHOPPING_DOMAINS)} or utm_medium ilike '%shop%' then concat(prefix, 'Shopping')when ${toPostgresPositionClause('referrer_domain', VIDEO_DOMAINS)} or utm_medium ilike '%video%' then concat(prefix, 'Video')- else '' end AS name,+ else '' end as "name",session_id,visit_id,c,diff --git a/src/queries/sql/pageviews/getPageviewExpandedMetrics.ts b/src/queries/sql/pageviews/getPageviewExpandedMetrics.tsindex 986d7d5a5..ccb0be53c 100644--- a/src/queries/sql/pageviews/getPageviewExpandedMetrics.ts+++ b/src/queries/sql/pageviews/getPageviewExpandedMetrics.ts@@ -86,7 +86,7 @@ async function relationalQuery(sum(${getTimestampDiffSQL('t.min_time', 't.max_time')}) as "totaltime"from (select- ${column} as name,+ ${column} as "name",website_event.session_id,website_event.visit_id,count(*) as "c",diff --git a/src/queries/sql/reports/getAttribution.ts b/src/queries/sql/reports/getAttribution.tsindex 1d040781d..29068f7de 100644--- a/src/queries/sql/reports/getAttribution.ts+++ b/src/queries/sql/reports/getAttribution.ts@@ -52,8 +52,8 @@ async function relationalQuery(function getUTMQuery(utmColumn: string) {return `select- coalesce(we.${utmColumn}, '') name,- ${currency ? 'sum(e.value)' : 'count(distinct we.session_id)'} value+ coalesce(we.${utmColumn}, '') as "name",+ ${currency ? 'sum(e.value)' : 'count(distinct we.session_id)'} as "value"from model mjoin website_event weon we.created_at = m.created_at@@ -128,7 +128,7 @@ async function relationalQuery(`${currency ? revenueEventQuery : eventQuery}${getModelQuery(model)}- select coalesce(we.referrer_domain, '') name,+ select coalesce(we.referrer_domain, '') as "name",${currency ? 'sum(e.value)' : 'count(distinct we.session_id)'} valuefrom model mjoin website_event we@@ -166,8 +166,8 @@ async function relationalQuery(when coalesce(li_fat_id, '') != '' then 'LinkedIn Ads'when coalesce(twclid, '') != '' then 'Twitter Ads (X)'else ''- end name,- ${currency ? 'sum(e.value)' : 'count(distinct we.session_id)'} value+ end as "name",+ ${currency ? 'sum(e.value)' : 'count(distinct we.session_id)'} as "value"from model mjoin website_event weon we.created_at = m.created_atdiff --git a/src/queries/sql/reports/getRevenue.ts b/src/queries/sql/reports/getRevenue.tsindex d3bff6c9a..30d7d7f1f 100644--- a/src/queries/sql/reports/getRevenue.ts+++ b/src/queries/sql/reports/getRevenue.ts@@ -76,8 +76,8 @@ async function relationalQuery(const country = await rawQuery(`select- session.country as name,- sum(revenue) value+ session.country as "name",+ sum(revenue) as "value"from revenue${joinQuery}join session@@ -176,8 +176,8 @@ async function clickhouseQuery(>(`select- website_event.country as name,- sum(website_revenue.revenue) as value+ website_event.country as "name",+ sum(website_revenue.revenue) as "value"from website_revenueany left join (select *diff --git a/src/queries/sql/sessions/getSessionExpandedMetrics.ts b/src/queries/sql/sessions/getSessionExpandedMetrics.tsindex 85c129391..c8d20d84b 100644--- a/src/queries/sql/sessions/getSessionExpandedMetrics.ts+++ b/src/queries/sql/sessions/getSessionExpandedMetrics.ts@@ -65,7 +65,7 @@ async function relationalQuery(sum(${getTimestampDiffSQL('t.min_time', 't.max_time')}) as "totaltime"from (select- ${column} name,+ ${column} as "name",${includeCountry ? 'country,' : ''}website_event.session_id,website_event.visit_id,