m/umami
1
0
Fork 0
mirror of https://github.com/kremalicious/umami.git synced 2025-02-14 21:10:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update database detection.

Browse Source
This commit is contained in:
Mike Cao 2020-08-30 00:02:03 -07:00
parent 07cc61f5c3
commit 7a81dda7b6
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/date.js
View File

@ -95,7 +95,6 @@ export function getDateArray(data, startDate, endDate, unit) {
const arr = []; const arr = [];
const [diff, add, normalize] = dateFuncs[unit]; const [diff, add, normalize] = dateFuncs[unit];
const n = diff(endDate, startDate) + 1; const n = diff(endDate, startDate) + 1;
console.log({ startDate, endDate, n });
function findData(t) { function findData(t) {
const x = data.find(e => { const x = data.find(e => {

5
lib/queries.js
View File

@ -22,7 +22,10 @@ const POSTGRESQL_DATE_FORMATS = {
}; };
export function getDatabase() { 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) { export function getDateQuery(db, field, unit, timezone) {

3
scripts/copy-db-schema.js
View File

@ -2,7 +2,8 @@ require('dotenv').config();
const fs = require('fs'); const fs = require('fs');
const path = require('path'); 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) { if (!databaseType) {
throw new Error('Database schema not specified'); throw new Error('Database schema not specified');