Merge branch 'dev' of https://github.com/umami-software/umami into dev

2023-04-18 12:45:08 -07:00
parent e8ca23c390 3eabe9b958
commit 16ece9ad64
27 changed files with 3172 additions and 241 deletions
--- a/scripts/check-db.js
+++ b/scripts/check-db.js
@@ -50,7 +50,7 @@ async function checkConnection() {
 }

 async function checkDatabaseVersion(databaseType) {
-  const query = await prisma.$queryRaw`select version() version`;
+  const query = await prisma.$queryRaw`select version() as version`;
  const version = semver.valid(semver.coerce(query[0].version));

  const minVersion = databaseType === 'postgresql' ? '9.4.0' : '5.7.0';