From 81e27fc18c9d4a05bf53a361777b64940610360e Mon Sep 17 00:00:00 2001 From: Mike Cao Date: Thu, 4 Dec 2025 00:37:13 -0800 Subject: [PATCH 1/4] Fix formatting for Docker compose instructions --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 95bb4330..cd365a68 100644 --- a/README.md +++ b/README.md @@ -80,7 +80,7 @@ Docker image: docker pull docker.umami.is/umami-software/umami:latest ``` -Docker compose to run Umami with a Postgres database, run: +Docker compose (Runs Umami with a PostgreSQL database): ```bash docker compose up -d From aaa8b5b6c9b0eb6d55284d63127d54879e7f613f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 4 Dec 2025 17:37:01 +0000 Subject: [PATCH 2/4] Bump jws from 3.2.2 to 3.2.3 Bumps [jws](https://github.com/brianloveswords/node-jws) from 3.2.2 to 3.2.3. - [Release notes](https://github.com/brianloveswords/node-jws/releases) - [Changelog](https://github.com/auth0/node-jws/blob/master/CHANGELOG.md) - [Commits](https://github.com/brianloveswords/node-jws/compare/v3.2.2...v3.2.3) --- updated-dependencies: - dependency-name: jws dependency-version: 3.2.3 dependency-type: indirect ... Signed-off-by: dependabot[bot] --- pnpm-lock.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 10eed821..d68fed5e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -331,8 +331,6 @@ importers: specifier: ^5.9.3 version: 5.9.3 - dist: {} - packages: '@ampproject/remapping@2.3.0': From 83b03d682ca21550497873ce088bd71092ed95eb Mon Sep 17 00:00:00 2001 From: Francis Cao Date: Thu, 4 Dec 2025 12:27:44 -0800 Subject: [PATCH 3/4] fix getRevenue case-insensitivity bug --- src/queries/sql/reports/getRevenue.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/queries/sql/reports/getRevenue.ts b/src/queries/sql/reports/getRevenue.ts index fa25078c..ebde8bb1 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, From 220c2af34495e71491235c360bfe7f36c9a3956d Mon Sep 17 00:00:00 2001 From: Francis Cao Date: Fri, 5 Dec 2025 09:18:53 -0800 Subject: [PATCH 4/4] fix revenue type --- src/queries/sql/reports/getRevenue.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/queries/sql/reports/getRevenue.ts b/src/queries/sql/reports/getRevenue.ts index ebde8bb1..19b75d42 100644 --- a/src/queries/sql/reports/getRevenue.ts +++ b/src/queries/sql/reports/getRevenue.ts @@ -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} - aand upper(website_revenue.currency) = {currency:String} + and upper(website_revenue.currency) = {currency:String} ${filterQuery} `, queryParams,