pengjunjie/server
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/server.git synced 2026-04-07 14:04:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

[utils] deepMergeObjecs(), isObject() functions added

Browse Source
This commit is contained in:
Georgii Petrov
2024-02-01 16:55:15 +03:00
parent 936b5a4d4a
commit ff8dd6433d
3 changed files with 32 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
DocService/sources/databaseConnectors/mssqlConnector.js
View File

@ -54,17 +54,7 @@ const connectionConfiguration = {
}
};
const additionalOptions = configSql.get('msSqlExtraOptions');
const mergedObjects = {};
for (const option in additionalOptions) {
if (connectionConfiguration.hasOwnProperty(option) && typeof connectionConfiguration[option] === 'object') {
mergedObjects[option] = Object.assign({}, connectionConfiguration[option], additionalOptions[option]);
} else {
mergedObjects[option] = additionalOptions[option];
}
}
const configuration = Object.assign({}, connectionConfiguration, mergedObjects);
const configuration = utils.deepMergeObjects({}, connectionConfiguration, additionalOptions);
const placeholderPrefix = 'ph_';