diff --git a/src/config.ts b/src/config.ts index 840e7f5..bc34ca4 100644 --- a/src/config.ts +++ b/src/config.ts @@ -42,7 +42,7 @@ export function getMysqlConnectionOptions(prefix = ''): ConnectionOptions { const DB_HOST = EnvParse.envString(`FW_${prefix}DB_HOST`, 'localhost'); const DB_PORT = EnvParse.envInt(`FW_${prefix}DB_PORT`, 3306); const DB_NAME = EnvParse.envString(`FW_${prefix}DB_NAME`, DB_USER); - const DB_CONN_OPTIONS = EnvParse.envJSON(`FW_${prefix}DB_NAME`, {}); + const DB_CONN_OPTIONS = EnvParse.envJSON(`FW_${prefix}DB_CONN_OPTIONS`, {}); const dbPassword = getDbPassword(DB_PASSWORD_FILE, DB_PASSWORD); const dbOptions = { @@ -54,8 +54,7 @@ export function getMysqlConnectionOptions(prefix = ''): ConnectionOptions { }; if (Object.keys(DB_CONN_OPTIONS).length > 0) { // See https://github.com/mysqljs/mysql#connection-options for all possible options - const customOptions = JSON.parse(DB_CONN_OPTIONS); - Object.assign(dbOptions, customOptions); + Object.assign(dbOptions, DB_CONN_OPTIONS); } memoizedOptions[prefix] = dbOptions; }