Merge branch 'master' into mongo

packages/api/src/controllers/plugins.js

@@ -28,9 +28,9 @@ const hasPermission = require('../utility/hasPermission');
 // }
 
 const preinstallPluginMinimalVersions = {
-  'dbgate-plugin-mssql': '1.2.0',
+  'dbgate-plugin-mssql': '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-excel': '1.0.6',
 };

packages/tools/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "4.0.0",
+  "version": "4.0.3-rc.1",
   "name": "dbgate-tools",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -35,4 +35,4 @@
   "dependencies": {
     "lodash": "^4.17.15"
   }
-}
+}

packages/tools/src/DatabaseAnalyser.ts

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