Dekescordes/spacebar
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix ConnectionLoader from throwing when uploading default config keys

Browse Source
This commit is contained in:
Madeline 2022-12-23 13:05:37 +11:00 committed by Puyodead1
parent a390596e3c
commit 8ff3767d32
No known key found for this signature in database
GPG Key ID: A4FA4FEC0DD353FC
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/util/connections/ConnectionLoader.ts
View File

@ -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) || {}))
});
}
}