opensource/cloudbeaver
3
0
Fork 0
mirror of https://github.com/dbeaver/cloudbeaver.git synced 2026-09-24 16:04:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #730 from dbeaver/tech/CB-1838

Browse Source 
CB-1838 full name node
This commit is contained in:
Alexey
2022-03-24 22:41:22 +03:00
committed by GitHub
parent 84f0ce4c4a 70596d1945
commit c56b22f4de
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/navigator/WebNavigatorNodeInfo.java
+12 -3
View File
@@ -21,8 +21,7 @@ import io.cloudbeaver.WebServiceUtils;
import io.cloudbeaver.model.WebPropertyInfo;
import io.cloudbeaver.model.session.WebSession;
import org.jkiss.dbeaver.DBException;
import org.jkiss.dbeaver.model.DBPObject;
import org.jkiss.dbeaver.model.DBPObjectWithDetails;
import org.jkiss.dbeaver.model.*;
import org.jkiss.dbeaver.model.edit.DBEObjectMaker;
import org.jkiss.dbeaver.model.edit.DBEObjectRenamer;
import org.jkiss.dbeaver.model.meta.Association;
@@ -68,7 +67,17 @@ public class WebNavigatorNodeInfo {
@Property
public String getFullName() {
return node.getNodeFullName();
String nodeName;
if (node instanceof DBNDatabaseNode && !(node instanceof DBNDataSource)) {
DBSObject object = ((DBNDatabaseNode) node).getObject();
nodeName = DBUtils.getObjectFullName(object, DBPEvaluationContext.UI);
} else if (node instanceof DBNDataSource) {
DBPDataSourceContainer object = ((DBNDataSource) node).getDataSourceContainer();
nodeName = object.getName();
} else {
nodeName = node.getNodeTargetName();
}
return nodeName;
}
@Property