diff --git a/README.md b/README.md index cd365a68d..95bb43303 100644 --- a/README.md +++ b/README.md @@ -80,7 +80,7 @@ Docker image: docker pull docker.umami.is/umami-software/umami:latest ``` -Docker compose (Runs Umami with a PostgreSQL database): +Docker compose to run Umami with a Postgres database, run: ```bash docker compose up -d diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d68fed5e7..10eed8210 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -331,6 +331,8 @@ importers: specifier: ^5.9.3 version: 5.9.3 + dist: {} + packages: '@ampproject/remapping@2.3.0': diff --git a/src/queries/sql/reports/getRevenue.ts b/src/queries/sql/reports/getRevenue.ts index 19b75d429..fa25078c3 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 upper(revenue.currency) = {{currency}} + and revenue.currency = upper({{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 upper(revenue.currency) = {{currency}} + and revenue.currency = upper({{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 upper(revenue.currency) = {{currency}} + and revenue.currency = upper({{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 upper(website_revenue.currency) = {currency:String} + and website_revenue.currency = upper({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 upper(website_revenue.currency) = {currency:String} + and website_revenue.currency = upper({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 upper(website_revenue.currency) = {currency:String} + and website_revenue.currency = upper({currency:String}) ${filterQuery} `, queryParams,