From 7a81dda7b6e33b343a3442087f2babfcbf6d6443 Mon Sep 17 00:00:00 2001 From: Mike Cao Date: Sun, 30 Aug 2020 00:02:03 -0700 Subject: [PATCH] Update database detection. --- lib/date.js | 1 - lib/queries.js | 5 ++++- scripts/copy-db-schema.js | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/date.js b/lib/date.js index 07a32654..13c2e55f 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 4faad484..4fe46ee2 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 5dda2215..f28c621e 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');