opensource/cloudbeaver
3
0
Fork 0
mirror of https://github.com/dbeaver/cloudbeaver.git synced 2026-10-24 11:35:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

dbeaver/pro#4739 Fix losing context execution after node refreshing (#3572)

Browse Source 
Co-authored-by: Daria Marutkina <125263541+dariamarutkina@users.noreply.github.com>
This commit is contained in:
Ruslan Musaev
2025-07-10 16:44:50 +02:00
committed by GitHub
co-authored by Daria Marutkina
parent 60fb6c5a3b
commit 5022c01468
1 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/navigator/impl/WebServiceNavigator.java
+18
View File
@@ -42,6 +42,7 @@ import org.jkiss.dbeaver.model.edit.DBEObjectMaker;
import org.jkiss.dbeaver.model.edit.DBEObjectRenamer;
import org.jkiss.dbeaver.model.exec.DBCExecutionContext;
import org.jkiss.dbeaver.model.exec.DBCExecutionContextDefaults;
import org.jkiss.dbeaver.model.exec.DBExecUtils;
import org.jkiss.dbeaver.model.navigator.*;
import org.jkiss.dbeaver.model.navigator.meta.DBXTreeItem;
import org.jkiss.dbeaver.model.rm.RMControllerProvider;
@@ -272,7 +273,24 @@ public class WebServiceNavigator implements DBWServiceNavigator {
// Otherwise refresh may fail if navigator settings were changed.
DBPDataSource dataSource = dbnDataSource.getDataSource();
if (dataSource instanceof DBPRefreshableObject refreshableObject) {
// During of refreshing datasource can create new default execution context and overwrite the old one.
// It's not good for cloudbeaver because we use default execution context one for all script of the datasource
// in that way all related scripts will use the same context and overwrite the user's define context
// So why we need restore the default execution context after refreshing datasource
DBCExecutionContext defaultContext = DBUtils.getDefaultContext(refreshableObject, false);
DBCExecutionContextDefaults contextDefaults = defaultContext.getContextDefaults();
refreshableObject.refreshObject(monitor);
if (contextDefaults != null && contextDefaults.getDefaultSchema() != null
&& contextDefaults.getDefaultCatalog() != null) {
DBExecUtils.setExecutionContextDefaults(
session.getProgressMonitor(),
dataSource,
defaultContext,
contextDefaults.getDefaultCatalog().getName(),
contextDefaults.getDefaultSchema().getName(),
contextDefaults.getDefaultSchema().getName()
);
}
}
dbnDataSource.cleanupNode();
} else if (node instanceof DBNLocalFolder) {