From 682cd891b19e374c07442c24776bd0f18b6dfa83 Mon Sep 17 00:00:00 2001 From: aramissennyeydd Date: Wed, 30 Oct 2024 11:49:42 -0400 Subject: [PATCH] fix: database config is already prefixed Signed-off-by: aramissennyeydd --- .../database/DatabaseManager.test.ts | 20 +++++-------------- .../entrypoints/database/DatabaseManager.ts | 6 ++---- 2 files changed, 7 insertions(+), 19 deletions(-) diff --git a/packages/backend-defaults/src/entrypoints/database/DatabaseManager.test.ts b/packages/backend-defaults/src/entrypoints/database/DatabaseManager.test.ts index 27cb511477..fb8e4011a8 100644 --- a/packages/backend-defaults/src/entrypoints/database/DatabaseManager.test.ts +++ b/packages/backend-defaults/src/entrypoints/database/DatabaseManager.test.ts @@ -106,12 +106,8 @@ describe('DatabaseManagerImpl', () => { const impl = new DatabaseManagerImpl( new ConfigReader({ client: 'pg', - backend: { - database: { - skipMigrations: true, - plugin: { plugin1: { skipMigrations: true } }, - }, - }, + skipMigrations: true, + plugin: { plugin1: { skipMigrations: true } }, }), { pg: connector, @@ -139,9 +135,7 @@ describe('DatabaseManagerImpl', () => { const impl = new DatabaseManagerImpl( new ConfigReader({ client: 'pg', - backend: { - database: { plugin: { plugin1: { skipMigrations: true } } }, - }, + plugin: { plugin1: { skipMigrations: true } }, }), { pg: connector, @@ -158,12 +152,8 @@ describe('DatabaseManagerImpl', () => { const impl2 = new DatabaseManagerImpl( new ConfigReader({ client: 'pg', - backend: { - database: { - skipMigrations: true, - plugin: { plugin1: { skipMigrations: false } }, - }, - }, + skipMigrations: true, + plugin: { plugin1: { skipMigrations: false } }, }), { pg: connector, diff --git a/packages/backend-defaults/src/entrypoints/database/DatabaseManager.ts b/packages/backend-defaults/src/entrypoints/database/DatabaseManager.ts index 7fddb17987..75e7d35eee 100644 --- a/packages/backend-defaults/src/entrypoints/database/DatabaseManager.ts +++ b/packages/backend-defaults/src/entrypoints/database/DatabaseManager.ts @@ -96,10 +96,8 @@ export class DatabaseManagerImpl { const skip = this.options?.migrations?.skip ?? - this.config.getOptionalBoolean( - `backend.database.plugin.${pluginId}.skipMigrations`, - ) ?? - this.config.getOptionalBoolean('backend.database.skipMigrations') ?? + this.config.getOptionalBoolean(`plugin.${pluginId}.skipMigrations`) ?? + this.config.getOptionalBoolean('skipMigrations') ?? false; return { getClient, migrations: { skip } };