mirror of
https://github.com/umami-software/umami.git
synced 2026-02-04 12:47:13 +01:00
Fix "name" alias for relational query to be compatible with Postgres 12. Closes #3970
Some checks are pending
Node.js CI / build (push) Waiting to run
Some checks are pending
Node.js CI / build (push) Waiting to run
This commit is contained in:
parent
d70152be38
commit
3f173889ea
6 changed files with 13 additions and 13 deletions
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -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 m
|
||||
join website_event we
|
||||
on 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)'} value
|
||||
from model m
|
||||
join 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 m
|
||||
join website_event we
|
||||
on we.created_at = m.created_at
|
||||
|
|
|
|||
|
|
@ -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_revenue
|
||||
any left join (
|
||||
select *
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue