From 900e3e57340149dac48d00b380f2a90db2b8e62e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Orhun=20Parmaks=C4=B1z?= <orhunparmaksiz@gmail.com>
Date: Thu, 21 Jul 2022 14:31:09 +0200
Subject: [PATCH 1/3] Update the links for current repository

---
 README.md          | 2 +-
 app.json           | 2 +-
 docker-compose.yml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index ad93b774..f29fd217 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,7 @@ npm install -g yarn
 ### Get the source code and install packages
 
 ```
-git clone https://github.com/mikecao/umami.git
+git clone https://github.com/umami-software/umami.git
 cd umami
 yarn install
 ```
diff --git a/app.json b/app.json
index ef62e0e5..ba8b8c45 100644
--- a/app.json
+++ b/app.json
@@ -3,7 +3,7 @@
   "description": "Umami is a simple, fast, website analytics alternative to Google Analytics.",
   "keywords": ["analytics", "charts", "statistics", "web-analytics"],
   "website": "https://umami.is",
-  "repository": "https://github.com/mikecao/umami",
+  "repository": "https://github.com/umami-software/umami",
   "addons": ["heroku-postgresql"],
   "env": {
     "HASH_SALT": {
diff --git a/docker-compose.yml b/docker-compose.yml
index 61bc8228..9864486c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,7 +2,7 @@
 version: '3'
 services:
   umami:
-    image: ghcr.io/mikecao/umami:postgresql-latest
+    image: ghcr.io/umami-software/umami:postgresql-latest
     ports:
       - "3000:3000"
     environment:

From 15ae4569c5c082b50d9a322f382396f4d2d08aa1 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Thu, 21 Jul 2022 22:52:25 -0700
Subject: [PATCH 2/3] Bump version v1.35.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index ae30688c..7c25ca35 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "umami",
-  "version": "1.34.0",
+  "version": "1.35.0",
   "description": "A simple, fast, privacy-focused alternative to Google Analytics.",
   "author": "Mike Cao <mike@mikecao.com>",
   "license": "MIT",

From bb1d17a5e20b40ef9c0715b851c9d0a78e16404b Mon Sep 17 00:00:00 2001
From: Maxime-J <Maxime-J@users.noreply.github.com>
Date: Fri, 22 Jul 2022 12:35:37 +0000
Subject: [PATCH 3/3] follow-up - reverted getDateQuery logic

---
 lib/queries.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/queries.js b/lib/queries.js
index b296d308..d6b8893d 100644
--- a/lib/queries.js
+++ b/lib/queries.js
@@ -21,7 +21,7 @@ export function getDateQuery(field, unit, timezone) {
     if (timezone) {
       return `to_char(date_trunc('${unit}', ${field} at time zone '${timezone}'), '${POSTGRESQL_DATE_FORMATS[unit]}')`;
     }
-    return `date_trunc('${unit}', ${field})`;
+    return `to_char(date_trunc('${unit}', ${field}), '${POSTGRESQL_DATE_FORMATS[unit]}')`;
   }
 
   if (db === MYSQL) {
@@ -31,7 +31,7 @@ export function getDateQuery(field, unit, timezone) {
       return `date_format(convert_tz(${field},'+00:00','${tz}'), '${MYSQL_DATE_FORMATS[unit]}')`;
     }
 
-    return `${field}`;
+    return `date_format(${field}, '${MYSQL_DATE_FORMATS[unit]}')`;
   }
 }