From 6046be50de6e17991e095af95b58e3c295325de9 Mon Sep 17 00:00:00 2001 From: R0m1k3 Date: Tue, 10 Mar 2026 12:35:27 +0100 Subject: [PATCH] feat: Introduce Drizzle ORM for database management and a script for initial schema setup. --- scripts/db-init.js | 6 +++--- src/db/index.ts | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/db-init.js b/scripts/db-init.js index 53a6eda..f844fab 100644 --- a/scripts/db-init.js +++ b/scripts/db-init.js @@ -21,10 +21,10 @@ async function main() { console.error("[DB Init] Error reading .db-config.json", e); } - // Force environment variable if present (for Docker/DevOps consistency) - if (process.env.DATABASE_URL) { + // Use environment variable as default IF NOT already loaded from config + if (!connectionString && process.env.DATABASE_URL) { connectionString = process.env.DATABASE_URL; - console.log("[DB Init] Using environment variable DATABASE_URL (Priority)."); + console.log("[DB Init] Using environment variable DATABASE_URL as fallback."); } if (!connectionString) { diff --git a/src/db/index.ts b/src/db/index.ts index 0c5266e..b7d9ff4 100644 --- a/src/db/index.ts +++ b/src/db/index.ts @@ -34,10 +34,10 @@ export function getDb() { console.error("[DB] Error reading config file:", err); } - // IMPORTANT: Environment variable MUST take precedence in container environments - if (process.env.DATABASE_URL) { + // Use environment variable as fallback if no config is found + if (!connectionString && process.env.DATABASE_URL) { connectionString = process.env.DATABASE_URL; - console.log("[DB] Using environment variable (優先度高)."); + console.log("[DB] Using environment variable as fallback."); } console.log("[DB] Initializing connection with:", maskUrl(connectionString));