From bccf47020e1c2e0f0b9df3b6bc4b65cb5f56f63c Mon Sep 17 00:00:00 2001
From: alex <48489896+devnaumov@users.noreply.github.com>
Date: Thu, 21 May 2026 18:22:42 +0200
Subject: [PATCH] dbeaver/pro#9095 load active connections before checking
 execution context (#4355)

Co-authored-by: Daria Marutkina <125263541+dariamarutkina@users.noreply.github.com>
---
 .../src/SqlEditorTabService.ts                                | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/webapp/packages/plugin-sql-editor-navigation-tab/src/SqlEditorTabService.ts b/webapp/packages/plugin-sql-editor-navigation-tab/src/SqlEditorTabService.ts
index e040d4b72b..025091fb3b 100644
--- a/webapp/packages/plugin-sql-editor-navigation-tab/src/SqlEditorTabService.ts
+++ b/webapp/packages/plugin-sql-editor-navigation-tab/src/SqlEditorTabService.ts
@@ -314,11 +314,11 @@ export class SqlEditorTabService extends Bootstrap {
     }
 
     const dataSource = this.sqlDataSourceService.create(tab.handlerState, tab.handlerState.datasourceKey);
+
+    await this.connectionInfoResource.load(ConnectionInfoActiveProjectKey);
     const executionContext = dataSource.executionContext;
 
     if (executionContext) {
-      await this.connectionInfoResource.load(ConnectionInfoActiveProjectKey);
-
       const contextConnection = createConnectionParam(executionContext.projectId, executionContext.connectionId);
 
       if (!this.connectionInfoResource.has(contextConnection)) {