mirror of
https://github.com/umami-software/umami.git
synced 2026-02-17 11:05:36 +01:00
Compare commits
No commits in common. "220c2af34495e71491235c360bfe7f36c9a3956d" and "60271779dea1f9886bdadf5444fc23f86897fa23" have entirely different histories.
220c2af344
...
60271779de
3 changed files with 9 additions and 7 deletions
|
|
@ -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
|
||||
|
|
|
|||
2
pnpm-lock.yaml
generated
2
pnpm-lock.yaml
generated
|
|
@ -331,6 +331,8 @@ importers:
|
|||
specifier: ^5.9.3
|
||||
version: 5.9.3
|
||||
|
||||
dist: {}
|
||||
|
||||
packages:
|
||||
|
||||
'@ampproject/remapping@2.3.0':
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue