From 981c190b75613d541ad51ab518b958a081a803e2 Mon Sep 17 00:00:00 2001
From: Serge Rider <serge@jkiss.org>
Date: Thu, 26 Dec 2019 16:42:02 +0300
Subject: [PATCH] #7472 Bootstrap config fix

---
 .../connection/DBPConnectionBootstrap.java     | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/connection/DBPConnectionBootstrap.java b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/connection/DBPConnectionBootstrap.java
index 5fb8f4a906..221a76bcd6 100644
--- a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/connection/DBPConnectionBootstrap.java
+++ b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/connection/DBPConnectionBootstrap.java
@@ -100,10 +100,11 @@ public class DBPConnectionBootstrap {
     public boolean hasData() {
         return
                 defaultAutoCommit != null ||
-                        defaultTransactionIsolation != null ||
-                        !CommonUtils.isEmpty(defaultCatalogName) ||
-                        ignoreErrors ||
-                        !CommonUtils.isEmpty(initQueries);
+                defaultTransactionIsolation != null ||
+                !CommonUtils.isEmpty(defaultCatalogName) ||
+                !CommonUtils.isEmpty(defaultSchemaName) ||
+                ignoreErrors ||
+                !CommonUtils.isEmpty(initQueries);
     }
 
     @Override
@@ -114,9 +115,10 @@ public class DBPConnectionBootstrap {
         DBPConnectionBootstrap source = (DBPConnectionBootstrap) obj;
         return
                 CommonUtils.equalObjects(this.defaultCatalogName, source.defaultCatalogName) &&
-                        CommonUtils.equalObjects(this.defaultAutoCommit, source.defaultAutoCommit) &&
-                        CommonUtils.equalObjects(this.defaultTransactionIsolation, source.defaultTransactionIsolation) &&
-                        CommonUtils.equalObjects(this.initQueries, source.initQueries) &&
-                        this.ignoreErrors == source.ignoreErrors;
+                CommonUtils.equalObjects(this.defaultSchemaName, source.defaultSchemaName) &&
+                CommonUtils.equalObjects(this.defaultAutoCommit, source.defaultAutoCommit) &&
+                CommonUtils.equalObjects(this.defaultTransactionIsolation, source.defaultTransactionIsolation) &&
+                CommonUtils.equalObjects(this.initQueries, source.initQueries) &&
+                this.ignoreErrors == source.ignoreErrors;
     }
 }
-- 
GitLab