RSCord/ServerSpacebarOld
Archived
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix missed merge

Browse Source
This commit is contained in:
Rory& 2025-10-04 18:42:59 +02:00
parent a06c8a3883
commit 1f68a745a5
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/util/connections/ConnectionConfig.ts
View File

@ -18,6 +18,7 @@
/* eslint-disable @typescript-eslint/no-explicit-any */ /* eslint-disable @typescript-eslint/no-explicit-any */
import { ConnectionConfigEntity } from "../entities/ConnectionConfigEntity"; import { ConnectionConfigEntity } from "../entities/ConnectionConfigEntity";
import { OrmUtils } from "../imports";
let config: any; let config: any;
let pairs: ConnectionConfigEntity[]; let pairs: ConnectionConfigEntity[];
@ -39,7 +40,7 @@ export const ConnectionConfig = {
}, },
set: function set(val: Partial<any>) { set: function set(val: Partial<any>) {
if (!config || !val) return; if (!config || !val) return;
config = val.merge(config); config = OrmUtils.mergeDeep(config, val);
// return applyConfig(config); // return applyConfig(config);
return applyConfig(val); return applyConfig(val);