Fix ConnectionLoader from throwing when uploading default config keys

1 files changed, 8 insertions, 10 deletions

diff --git a/src/util/connections/ConnectionLoader.ts b/src/util/connections/ConnectionLoader.ts

index 7467739c..04d7752a 100644
--- a/src/util/connections/ConnectionLoader.ts
+++ b/src/util/connections/ConnectionLoader.ts
@@ -34,9 +34,11 @@ export class ConnectionLoader {
 	public static getConnectionConfig(id: string, defaults?: any): any {
 		let cfg = ConnectionConfig.get()[id];
 		if (defaults) {
-			if (cfg) cfg = OrmUtils.mergeDeep(defaults, cfg);
-			else cfg = defaults;
-			this.setConnectionConfig(id, cfg);
+			if (cfg) cfg = Object.assign({}, defaults, cfg);
+			else {
+				cfg = defaults;
+				this.setConnectionConfig(id, cfg);
+			}
 		}
 
 		if (!cfg)
@@ -55,12 +57,8 @@ export class ConnectionLoader {
 				`[ConnectionConfig/WARN] ${id} tried to set config=null!`,
 			);
 
-		const a = {
-			[id]: OrmUtils.mergeDeep(
-				ConnectionLoader.getConnectionConfig(id) || {},
-				config,
-			),
-		};
-		await ConnectionConfig.set(a);
+		await ConnectionConfig.set({
+			[id]: Object.assign(config, (ConnectionLoader.getConnectionConfig(id) || {}))
+		});
 	}
 }