github/umami
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

add case-insensitivity to currency comparison

Browse Source
This commit is contained in:
Francis Cao
2025-11-26 11:01:58 -08:00
parent af958b6462
commit ac6ed9d762
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/queries/sql/reports/getRevenue.ts
View File

@@ -62,7 +62,7 @@ async function relationalQuery(
${joinSessionQuery} ${joinSessionQuery}
where revenue.website_id = {{websiteId::uuid}} where revenue.website_id = {{websiteId::uuid}}
and revenue.created_at between {{startDate}} and {{endDate}} and revenue.created_at between {{startDate}} and {{endDate}}
and revenue.currency ilike {{currency}} and revenue.currency = upper({{currency}})
${filterQuery} ${filterQuery}
group by x, t group by x, t
order by t order by t
@@ -83,7 +83,7 @@ async function relationalQuery(
${cohortQuery} ${cohortQuery}
where revenue.website_id = {{websiteId::uuid}} where revenue.website_id = {{websiteId::uuid}}
and revenue.created_at between {{startDate}} and {{endDate}} and revenue.created_at between {{startDate}} and {{endDate}}
and revenue.currency ilike {{currency}} and revenue.currency = upper({{currency}})
${filterQuery} ${filterQuery}
group by session.country group by session.country
`, `,
@@ -102,7 +102,7 @@ async function relationalQuery(
${joinSessionQuery} ${joinSessionQuery}
where revenue.website_id = {{websiteId::uuid}} where revenue.website_id = {{websiteId::uuid}}
and revenue.created_at between {{startDate}} and {{endDate}} and revenue.created_at between {{startDate}} and {{endDate}}
and revenue.currency ilike {{currency}} and revenue.currency = upper({{currency}})
${filterQuery} ${filterQuery}
`, `,
queryParams, queryParams,
@@ -154,7 +154,7 @@ async function clickhouseQuery(
${cohortQuery} ${cohortQuery}
where website_revenue.website_id = {websiteId:UUID} where website_revenue.website_id = {websiteId:UUID}
and website_revenue.created_at between {startDate:DateTime64} and {endDate:DateTime64} and website_revenue.created_at between {startDate:DateTime64} and {endDate:DateTime64}
and website_revenue.currency = {currency:String} and website_revenue.currency = upper({currency:String})
${filterQuery} ${filterQuery}
group by x, t group by x, t
order by t order by t
@@ -182,7 +182,7 @@ async function clickhouseQuery(
${cohortQuery} ${cohortQuery}
where website_revenue.website_id = {websiteId:UUID} where website_revenue.website_id = {websiteId:UUID}
and website_revenue.created_at between {startDate:DateTime64} and {endDate:DateTime64} and website_revenue.created_at between {startDate:DateTime64} and {endDate:DateTime64}
and website_revenue.currency = {currency:String} and website_revenue.currency = upper({currency:String})
${filterQuery} ${filterQuery}
group by website_event.country group by website_event.country
order by value desc order by value desc
@@ -205,7 +205,7 @@ async function clickhouseQuery(
${cohortQuery} ${cohortQuery}
where website_revenue.website_id = {websiteId:UUID} where website_revenue.website_id = {websiteId:UUID}
and website_revenue.created_at between {startDate:DateTime64} and {endDate:DateTime64} and website_revenue.created_at between {startDate:DateTime64} and {endDate:DateTime64}
and website_revenue.currency = {currency:String} and website_revenue.currency = upper({currency:String})
${filterQuery} ${filterQuery}
`, `,
queryParams, queryParams,