final tweaks

Signed-off-by: Fredrik Adelöw <freben@gmail.com>
2021-12-02 19:53:44 +01:00
parent 6298de32dd
commit 6cecfbba73
1 changed files with 6 additions and 4 deletions
@@ -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);
  }