From 666b41b1c60402a9ba832824172c23166df47e2c Mon Sep 17 00:00:00 2001
From: Wroud <wrouds@gmail.com>
Date: Wed, 29 Apr 2020 00:51:12 +0300
Subject: [PATCH] fix(core): load objectContainers only for sql-editor

#23
---
 .../ConnectionSchemaManagerService.ts             | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/webapp/packages/core/src/app/TopNavBar/ConnectionSchemaManager/ConnectionSchemaManagerService.ts b/webapp/packages/core/src/app/TopNavBar/ConnectionSchemaManager/ConnectionSchemaManagerService.ts
index a07c43eec8..284975a4a9 100644
--- a/webapp/packages/core/src/app/TopNavBar/ConnectionSchemaManager/ConnectionSchemaManagerService.ts
+++ b/webapp/packages/core/src/app/TopNavBar/ConnectionSchemaManager/ConnectionSchemaManagerService.ts
@@ -201,12 +201,21 @@ export class ConnectionSchemaManagerService {
   }
 
   private async loadConnection(connectionId: string, catalogId?: string) {
-
     try {
       await this.connectionsManagerService.dbDrivers.load();
-      await this.connectionsManagerService.loadObjectContainer(connectionId, catalogId);
     } catch (exception) {
-      this.notificationService.logException(exception, `Can't load connection: ${connectionId}`);
+      this.notificationService.logException(exception, 'Can\'t load database drivers', true);
+    }
+
+    if (this.changeCatalogId || this.changeSchemaId) {
+      try {
+        await this.connectionsManagerService.loadObjectContainer(connectionId, catalogId);
+      } catch (exception) {
+        this.notificationService.logException(
+          exception,
+          `Can't load objectContainers for ${connectionId}@${catalogId}`,
+        );
+      }
     }
   }
 }