Skip to content

armgit / umami

Public Imported from GitHub
0

Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.

Update database detection.

Mike Cao7a81dda7b6e3
diff --git a/lib/date.js b/lib/date.js
index 07a326542..13c2e55f8 100644
--- a/lib/date.js
+++ b/lib/date.js
@@ -95,7 +95,6 @@ export function getDateArray(data, startDate, endDate, unit) {
const arr = [];
const [diff, add, normalize] = dateFuncs[unit];
const n = diff(endDate, startDate) + 1;
- console.log({ startDate, endDate, n });
function findData(t) {
const x = data.find(e => {
diff --git a/lib/queries.js b/lib/queries.js
index 4faad4840..4fe46ee2c 100644
--- a/lib/queries.js
+++ b/lib/queries.js
@@ -22,7 +22,10 @@ const POSTGRESQL_DATE_FORMATS = {
};
export function getDatabase() {
- return process.env.DATABASE_TYPE || process.env.DATABASE_URL.split(':')[0];
+ return (
+ process.env.DATABASE_TYPE ||
+ (process.env.DATABASE_URL && process.env.DATABASE_URL.split(':')[0])
+ );
}
export function getDateQuery(db, field, unit, timezone) {
diff --git a/scripts/copy-db-schema.js b/scripts/copy-db-schema.js
index 5dda2215e..f28c621ef 100644
--- a/scripts/copy-db-schema.js
+++ b/scripts/copy-db-schema.js
@@ -2,7 +2,8 @@ require('dotenv').config();
const fs = require('fs');
const path = require('path');
-const databaseType = process.env.DATABASE_TYPE || process.env.DATABASE_URL.split(':')[0];
+const databaseType =
+ process.env.DATABASE_TYPE || (process.env.DATABASE_URL && process.env.DATABASE_URL.split(':')[0]);
if (!databaseType) {
throw new Error('Database schema not specified');