dennii/dbgate
1
0
Fork 0
mirror of https://github.com/DeNNiiInc/dbgate.git synced 2026-04-29 06:26:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into mongo

Browse Source
This commit is contained in:
Jan Prochazka
2021-04-03 19:53:14 +02:00
parent 41cf7009b3 a23ff752a3
commit fcedeb2316
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/api/src/controllers/plugins.js
View File

@@ -28,9 +28,9 @@ const hasPermission = require('../utility/hasPermission');
// } // }
const preinstallPluginMinimalVersions = { const preinstallPluginMinimalVersions = {
'dbgate-plugin-mssql': '1.2.0', 'dbgate-plugin-mssql': '1.2.1',
'dbgate-plugin-mysql': '1.2.1', 'dbgate-plugin-mysql': '1.2.1',
'dbgate-plugin-postgres': '1.2.0', 'dbgate-plugin-postgres': '1.2.1',
'dbgate-plugin-csv': '1.0.8', 'dbgate-plugin-csv': '1.0.8',
'dbgate-plugin-excel': '1.0.6', 'dbgate-plugin-excel': '1.0.6',
}; };

2
packages/tools/package.json
View File

@@ -1,5 +1,5 @@
{ {
"version": "4.0.0", "version": "4.0.3-rc.1",
"name": "dbgate-tools", "name": "dbgate-tools",
"main": "lib/index.js", "main": "lib/index.js",
"typings": "lib/index.d.ts", "typings": "lib/index.d.ts",

8
packages/tools/src/DatabaseAnalyser.ts
View File

@@ -40,7 +40,7 @@ export class DatabaseAnalyser {
return this._runAnalysis(); return this._runAnalysis();
} }
mergeAnalyseResult(newlyAnalysed, extractObjectId) { mergeAnalyseResult(newlyAnalysed) {
if (this.structure == null) { if (this.structure == null) {
return { return {
...DatabaseAnalyser.createEmptyStructure(), ...DatabaseAnalyser.createEmptyStructure(),
@@ -52,12 +52,12 @@ export class DatabaseAnalyser {
for (const field of ['tables', 'collections', 'views', 'functions', 'procedures', 'triggers']) { for (const field of ['tables', 'collections', 'views', 'functions', 'procedures', 'triggers']) {
const removedIds = this.modifications const removedIds = this.modifications
.filter(x => x.action == 'remove' && x.objectTypeField == field) .filter(x => x.action == 'remove' && x.objectTypeField == field)
.map(x => extractObjectId(x)); .map(x => x.objectId);
const newArray = newlyAnalysed[field] || []; const newArray = newlyAnalysed[field] || [];
const addedChangedIds = newArray.map(x => extractObjectId(x)); const addedChangedIds = newArray.map(x => x.objectId);
const removeAllIds = [...removedIds, ...addedChangedIds]; const removeAllIds = [...removedIds, ...addedChangedIds];
res[field] = _sortBy( res[field] = _sortBy(
[...this.structure[field].filter(x => !removeAllIds.includes(extractObjectId(x))), ...newArray], [...this.structure[field].filter(x => !removeAllIds.includes(x.objectId)), ...newArray],
x => x.pureName x => x.pureName
); );
} }