ui fixes, input fixes, better dev workflow
This commit is contained in:
@@ -16,20 +16,24 @@ function readEnvValue(filePath: string, key: string): string | undefined {
|
||||
}
|
||||
|
||||
function resolveDatabaseUrl(): string {
|
||||
if (process.env.TEST_DATABASE_URL?.trim()) return process.env.TEST_DATABASE_URL.trim();
|
||||
if (process.env.BACKUP_DATABASE_URL?.trim()) return process.env.BACKUP_DATABASE_URL.trim();
|
||||
if (process.env.DATABASE_URL?.trim()) return process.env.DATABASE_URL.trim();
|
||||
const normalizeHost = (url: string) => url.replace("@postgres:", "@127.0.0.1:");
|
||||
|
||||
if (process.env.TEST_DATABASE_URL?.trim()) return normalizeHost(process.env.TEST_DATABASE_URL.trim());
|
||||
if (process.env.BACKUP_DATABASE_URL?.trim())
|
||||
return normalizeHost(process.env.BACKUP_DATABASE_URL.trim());
|
||||
|
||||
const envPaths = [resolve(process.cwd(), ".env"), resolve(process.cwd(), "..", ".env")];
|
||||
for (const envPath of envPaths) {
|
||||
const testUrl = readEnvValue(envPath, "TEST_DATABASE_URL");
|
||||
if (testUrl) return testUrl;
|
||||
if (testUrl) return normalizeHost(testUrl);
|
||||
const backupUrl = readEnvValue(envPath, "BACKUP_DATABASE_URL");
|
||||
if (backupUrl) return backupUrl;
|
||||
if (backupUrl) return normalizeHost(backupUrl);
|
||||
const dbUrl = readEnvValue(envPath, "DATABASE_URL");
|
||||
if (dbUrl) return dbUrl.replace("@postgres:", "@127.0.0.1:");
|
||||
if (dbUrl) return normalizeHost(dbUrl);
|
||||
}
|
||||
|
||||
if (process.env.DATABASE_URL?.trim()) return normalizeHost(process.env.DATABASE_URL.trim());
|
||||
|
||||
return "postgres://app:app@127.0.0.1:5432/skymoney_test";
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user