From c45d847aedbedd2cf6539ac8e08f03c033f9c3ca Mon Sep 17 00:00:00 2001
From: Serge Rider <serge@jkiss.org>
Date: Mon, 21 Dec 2020 11:12:35 +0300
Subject: [PATCH] CB-570 Set context defaults on server (one new context
 create)

---
 .../service/sql/WebSQLContextInfo.java            | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLContextInfo.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLContextInfo.java
index a2d104ac27..0a0b4d9abf 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLContextInfo.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLContextInfo.java
@@ -59,7 +59,20 @@ public class WebSQLContextInfo {
         this.processor = processor;
         this.id = id;
 
-        setContextDefaults(catalogName, schemaName);
+        if (!CommonUtils.isEmpty(catalogName) || !CommonUtils.isEmpty(schemaName)) {
+            try {
+                DBExecUtils.setExecutionContextDefaults(
+                    processor.getWebSession().getProgressMonitor(),
+                    processor.getConnection().getDataSource(),
+                    processor.getExecutionContext(),
+                    catalogName,
+                    null,
+                    schemaName);
+                setContextDefaults(catalogName, schemaName);
+            } catch (DBException e) {
+                log.error("Error settings ");
+            }
+        }
     }
 
     private void setContextDefaults(String catalogName, String schemaName) throws DBCException {