From 87988d5c3ac45175cda8adbde9fef5b8e31e39e8 Mon Sep 17 00:00:00 2001
From: Jan Prochazka <jan.prochazka@gmail.com>
Date: Sat, 3 Apr 2021 18:53:46 +0200
Subject: [PATCH 1/3] db analyser fix

---
 packages/api/src/controllers/plugins.js | 2 +-
 packages/tools/src/DatabaseAnalyser.ts  | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/api/src/controllers/plugins.js b/packages/api/src/controllers/plugins.js
index d84e31111..3df63ff95 100644
--- a/packages/api/src/controllers/plugins.js
+++ b/packages/api/src/controllers/plugins.js
@@ -29,7 +29,7 @@ const hasPermission = require('../utility/hasPermission');
 
 const preinstallPluginMinimalVersions = {
   'dbgate-plugin-mssql': '1.2.0',
-  'dbgate-plugin-mysql': '1.2.1',
+  'dbgate-plugin-mysql': '1.2.0',
   'dbgate-plugin-postgres': '1.2.0',
   'dbgate-plugin-csv': '1.0.8',
   'dbgate-plugin-excel': '1.0.6',
diff --git a/packages/tools/src/DatabaseAnalyser.ts b/packages/tools/src/DatabaseAnalyser.ts
index 0667fa930..3515ba9c5 100644
--- a/packages/tools/src/DatabaseAnalyser.ts
+++ b/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', '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
       );
     }

From 138b0414f21bfae706f68360f955a0a8b818b307 Mon Sep 17 00:00:00 2001
From: Jan Prochazka <jan.prochazka@gmail.com>
Date: Sat, 3 Apr 2021 18:54:58 +0200
Subject: [PATCH 2/3] packages-tools v4.0.3-rc.1

---
 packages/tools/package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/tools/package.json b/packages/tools/package.json
index daf72d09a..2ac888551 100644
--- a/packages/tools/package.json
+++ b/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"
   }
-}
\ No newline at end of file
+}

From a23ff752a3e88f83ad1b53367597e90d08c76875 Mon Sep 17 00:00:00 2001
From: Jan Prochazka <jan.prochazka@gmail.com>
Date: Sat, 3 Apr 2021 19:53:00 +0200
Subject: [PATCH 3/3] upgraded dependencies

---
 packages/api/src/controllers/plugins.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/api/src/controllers/plugins.js b/packages/api/src/controllers/plugins.js
index 3df63ff95..c457f0fcf 100644
--- a/packages/api/src/controllers/plugins.js
+++ b/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-mysql': '1.2.0',
-  'dbgate-plugin-postgres': '1.2.0',
+  'dbgate-plugin-mssql': '1.2.1',
+  'dbgate-plugin-mysql': '1.2.1',
+  'dbgate-plugin-postgres': '1.2.1',
   'dbgate-plugin-csv': '1.0.8',
   'dbgate-plugin-excel': '1.0.6',
 };