From 6cecfbba7363b64be8dbea424295257027e0048a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= <freben@gmail.com>
Date: Thu, 2 Dec 2021 19:53:44 +0100
Subject: [PATCH] final tweaks
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Fredrik Adelöw <freben@gmail.com>
---
 .../backend-common/src/database/DatabaseManager.ts     | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/backend-common/src/database/DatabaseManager.ts b/packages/backend-common/src/database/DatabaseManager.ts
index 9cafac778f..a3f31e98f2 100644
--- a/packages/backend-common/src/database/DatabaseManager.ts
+++ b/packages/backend-common/src/database/DatabaseManager.ts
@@ -145,11 +145,13 @@ export class DatabaseManager {
    * @returns the merged kexConfig value or undefined if it isn't specified
    */
   private getAdditionalKnexConfig(pluginId: string): JsonObject | undefined {
-    const pluginConfig = this.config.getOptional<JsonObject>(
-      `${pluginPath(pluginId)}.knexConfig`,
-    );
+    const pluginConfig = this.config
+      .getOptionalConfig(`${pluginPath(pluginId)}.knexConfig`)
+      ?.get<JsonObject>();
 
-    const baseConfig = this.config.getOptional<JsonObject>('knexConfig');
+    const baseConfig = this.config
+      .getOptionalConfig('knexConfig')
+      ?.get<JsonObject>();
 
     return merge(baseConfig, pluginConfig);
   }