|
1 | 1 | import mysql from 'mysql2/promise'; |
2 | 2 |
|
3 | | -// Check required environment variables |
4 | | -const requiredEnvVars = ['DB_HOST', 'DB_PORT', 'DB_USER', 'DB_PASSWORD', 'DB_NAME']; |
5 | | -for (const envVar of requiredEnvVars) { |
6 | | - if (!process.env[envVar]) { |
7 | | - throw new Error(`Missing required environment variable: ${envVar}`); |
| 3 | +// Check required environment variables (only when actually using the database) |
| 4 | +function checkRequiredEnvVars() { |
| 5 | + const requiredEnvVars = ['DB_HOST', 'DB_PORT', 'DB_USER', 'DB_PASSWORD', 'DB_NAME']; |
| 6 | + for (const envVar of requiredEnvVars) { |
| 7 | + if (!process.env[envVar]) { |
| 8 | + throw new Error(`Missing required environment variable: ${envVar}`); |
| 9 | + } |
8 | 10 | } |
9 | 11 | } |
10 | 12 |
|
11 | | -// Database connection configuration (excluding database name) |
12 | | -const dbConfig = { |
13 | | - host: process.env.DB_HOST, |
14 | | - port: parseInt(process.env.DB_PORT || '3306'), |
15 | | - user: process.env.DB_USER, |
16 | | - password: process.env.DB_PASSWORD |
17 | | -}; |
| 13 | +// Get database connection configuration (excluding database name) |
| 14 | +function getDbConfig() { |
| 15 | + checkRequiredEnvVars(); |
| 16 | + return { |
| 17 | + host: process.env.DB_HOST, |
| 18 | + port: parseInt(process.env.DB_PORT || '3306'), |
| 19 | + user: process.env.DB_USER, |
| 20 | + password: process.env.DB_PASSWORD |
| 21 | + }; |
| 22 | +} |
18 | 23 |
|
19 | | -// Database name |
20 | | -const DATABASE_NAME = process.env.DB_NAME; |
| 24 | +// Get database name |
| 25 | +function getDatabaseName() { |
| 26 | + checkRequiredEnvVars(); |
| 27 | + return process.env.DB_NAME!; |
| 28 | +} |
21 | 29 |
|
22 | 30 | // Global connection pool instance |
23 | 31 | let poolInstance: mysql.Pool | null = null; |
24 | 32 |
|
25 | 33 | // Create database and initialize tables |
26 | 34 | export async function initDatabase() { |
27 | 35 | try { |
| 36 | + const dbConfig = getDbConfig(); |
| 37 | + const DATABASE_NAME = getDatabaseName(); |
| 38 | + |
28 | 39 | // Create connection pool without specifying database |
29 | 40 | const pool = mysql.createPool(dbConfig); |
30 | 41 | const connection = await pool.getConnection(); |
@@ -219,6 +230,9 @@ export async function initDatabase() { |
219 | 230 | // Get database connection pool (used for database operations in the application) |
220 | 231 | export function getPool() { |
221 | 232 | if (!poolInstance) { |
| 233 | + const dbConfig = getDbConfig(); |
| 234 | + const DATABASE_NAME = getDatabaseName(); |
| 235 | + |
222 | 236 | poolInstance = mysql.createPool({ |
223 | 237 | ...dbConfig, |
224 | 238 | database: DATABASE_NAME, |
|
0 commit comments