Skip to content

armgit / umami

Public Imported from GitHub
0

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.

fix getRevenue case-insensitivity bug

Francis Cao83b03d682ca2
diff --git a/src/queries/sql/reports/getRevenue.ts b/src/queries/sql/reports/getRevenue.ts
index fa25078c3..ebde8bb1b 100644
--- a/src/queries/sql/reports/getRevenue.ts
+++ b/src/queries/sql/reports/getRevenue.ts
@@ -62,7 +62,7 @@ async function relationalQuery(
${joinSessionQuery}
where revenue.website_id = {{websiteId::uuid}}
and revenue.created_at between {{startDate}} and {{endDate}}
- and revenue.currency = upper({{currency}})
+ and upper(revenue.currency) = {{currency}}
${filterQuery}
group by x, t
order by t
@@ -83,7 +83,7 @@ async function relationalQuery(
${cohortQuery}
where revenue.website_id = {{websiteId::uuid}}
and revenue.created_at between {{startDate}} and {{endDate}}
- and revenue.currency = upper({{currency}})
+ and upper(revenue.currency) = {{currency}}
${filterQuery}
group by session.country
`,
@@ -102,7 +102,7 @@ async function relationalQuery(
${joinSessionQuery}
where revenue.website_id = {{websiteId::uuid}}
and revenue.created_at between {{startDate}} and {{endDate}}
- and revenue.currency = upper({{currency}})
+ and upper(revenue.currency) = {{currency}}
${filterQuery}
`,
queryParams,
@@ -154,7 +154,7 @@ async function clickhouseQuery(
${cohortQuery}
where website_revenue.website_id = {websiteId:UUID}
and website_revenue.created_at between {startDate:DateTime64} and {endDate:DateTime64}
- and website_revenue.currency = upper({currency:String})
+ and upper(website_revenue.currency) = {currency:String}
${filterQuery}
group by x, t
order by t
@@ -182,7 +182,7 @@ async function clickhouseQuery(
${cohortQuery}
where website_revenue.website_id = {websiteId:UUID}
and website_revenue.created_at between {startDate:DateTime64} and {endDate:DateTime64}
- and website_revenue.currency = upper({currency:String})
+ and upper(website_revenue.currency) = {currency:String}
${filterQuery}
group by website_event.country
order by value desc
@@ -205,7 +205,7 @@ async function clickhouseQuery(
${cohortQuery}
where website_revenue.website_id = {websiteId:UUID}
and website_revenue.created_at between {startDate:DateTime64} and {endDate:DateTime64}
- and website_revenue.currency = upper({currency:String})
+ aand upper(website_revenue.currency) = {currency:String}
${filterQuery}
`,
queryParams,