diff --git a/scripts/check-db.js b/scripts/check-db.js index cdfeafa327..b0fb7efd7f 100644 --- a/scripts/check-db.js +++ b/scripts/check-db.js @@ -10,7 +10,7 @@ if (process.env.SKIP_DB_CHECK) { process.exit(0); } -function getDatabaseType(url = process.env.DATABASE_URL) { +function getDatabaseType(url = process.env.UMAMI_DATABASE_URL || process.env.DATABASE_URL) { const type = url && url.split(':')[0]; if (type === 'postgres') { @@ -31,10 +31,10 @@ function error(msg) { } async function checkEnv() { - if (!process.env.DATABASE_URL) { - throw new Error('DATABASE_URL is not defined.'); + if (!process.env.UMAMI_DATABASE_URL && !process.env.DATABASE_URL) { + throw new Error('Neither UMAMI_DATABASE_URL nor DATABASE_URL is defined.'); } else { - success('DATABASE_URL is defined.'); + success('Database URL is defined.'); } } diff --git a/scripts/check-env.js b/scripts/check-env.js index 280e7e398f..36d80d4b42 100644 --- a/scripts/check-env.js +++ b/scripts/check-env.js @@ -19,7 +19,10 @@ function checkMissing(vars) { } if (!process.env.SKIP_DB_CHECK && !process.env.DATABASE_TYPE) { - checkMissing(['DATABASE_URL']); + if (!process.env.UMAMI_DATABASE_URL && !process.env.DATABASE_URL) { + console.log('Neither UMAMI_DATABASE_URL nor DATABASE_URL is defined.'); + process.exit(1); + } } if (process.env.CLOUD_MODE) { diff --git a/scripts/copy-db-files.js b/scripts/copy-db-files.js index 15c34674f0..2efad0ccac 100644 --- a/scripts/copy-db-files.js +++ b/scripts/copy-db-files.js @@ -4,7 +4,7 @@ const fse = require('fs-extra'); const path = require('path'); const del = require('del'); -function getDatabaseType(url = process.env.DATABASE_URL) { +function getDatabaseType(url = process.env.UMAMI_DATABASE_URL || process.env.DATABASE_URL) { const type = process.env.DATABASE_TYPE || (url && url.split(':')[0]); if (type === 'postgres') { diff --git a/src/lib/db.ts b/src/lib/db.ts index 0ffedd0d87..524bf4d00f 100644 --- a/src/lib/db.ts +++ b/src/lib/db.ts @@ -10,7 +10,7 @@ BigInt.prototype['toJSON'] = function () { return Number(this); }; -export function getDatabaseType(url = process.env.DATABASE_URL) { +export function getDatabaseType(url = process.env.UMAMI_DATABASE_URL || process.env.DATABASE_URL) { const type = url && url.split(':')[0]; if (type === 'postgres') {