Skip to content

Fix/CB-1097 #697

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
yagudin10 wants to merge 8 commits into from
Closed

Fix/CB-1097 #697

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a6e593d
CB-1332 add features to data container
Mar 2, 2022
880ee73
CB-1332 add features to data container
Mar 3, 2022
d0117fc
CB-1332 add features to data container
Mar 3, 2022
99dc332
CB-1332 add features to data container
Mar 3, 2022
68b0108
CB-1332 add features to data container
Mar 3, 2022
b262586
CB-1332 add features to data container
Mar 3, 2022
e9eba42
CB-1097 fix bug with data types
Mar 3, 2022
8ecd2ab
CB-1097 fix bug with data types
Mar 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 32 additions & 12 deletions ...les/io.cloudbeaver.server/src/io/cloudbeaver/service/navigator/WebDatabaseObjectInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,28 @@
import java.util.ArrayList;
import java.util.List;


/**
* Web connection info
*/
public class WebDatabaseObjectInfo {

private static final Log log = Log.getLog(WebDatabaseObjectInfo.class);

public static final String OBJECT_FEATURE_CATALOG = "catalog";
public static final String OBJECT_FEATURE_DATA_CONTAINER = "dataContainer";
public static final String OBJECT_FEATURE_DATA_CONTAINER_SUPPORTS_FILTERS = "supportsDataFilter";
public static final String OBJECT_FEATURE_DATA_MANIPULATOR = "dataManipulator";
public static final String OBJECT_FEATURE_DATA_SOURCE = "dataSource";
public static final String OBJECT_FEATURE_DATA_SOURCE_CONNECTED = "dataSourceConnected";
public static final String OBJECT_FEATURE_DATA_SOURCE_TEMPORARY = "dataSourceTemporary";
public static final String OBJECT_FEATURE_ENTITY = "entity";
public static final String OBJECT_FEATURE_ENTITY_CONTAINER = "entityContainer";
public static final String OBJECT_FEATURE_OBJECT_CONTAINER = "objectContainer";
public static final String OBJECT_FEATURE_SCHEMA = "schema";
public static final String OBJECT_FEATURE_SCRIPT = "script";
public static final String OBJECT_FEATURE_SCRIPT_EXTENDED = "scriptExtended";

private final WebSession session;
private final DBSObject object;

Expand Down Expand Up @@ -134,13 +149,13 @@ public String[] getFeatures() {
List<String> features = new ArrayList<>();
getObjectFeatures(object, features);
if (object instanceof DBPDataSourceContainer) {
features.add("dataSource");
features.add(OBJECT_FEATURE_DATA_SOURCE);
DBPDataSourceContainer dbpDataSourceContainer = (DBPDataSourceContainer) this.object;
if (dbpDataSourceContainer.isConnected()) {
features.add("dataSourceConnected");
features.add(OBJECT_FEATURE_DATA_SOURCE_CONNECTED);
}
if (dbpDataSourceContainer.isTemporary()) {
features.add("dataSourceTemporary");
features.add(OBJECT_FEATURE_DATA_SOURCE_TEMPORARY);
}
if (dbpDataSourceContainer.isConnected()) {
DBPDataSource dataSource = dbpDataSourceContainer.getDataSource();
Expand All @@ -153,19 +168,24 @@ public String[] getFeatures() {
}

private static void getObjectFeatures(DBSObject object, List<String> features) {
if (object instanceof DBPScriptObject) features.add("script");
if (object instanceof DBPScriptObjectExt) features.add("scriptExtended");
if (object instanceof DBSDataContainer) features.add("dataContainer");
if (object instanceof DBSDataManipulator) features.add("dataManipulator");
if (object instanceof DBSEntity) features.add("entity");
if (object instanceof DBSSchema) features.add("schema");
if (object instanceof DBSCatalog) features.add("catalog");
if (object instanceof DBPScriptObject) features.add(OBJECT_FEATURE_SCRIPT);
if (object instanceof DBPScriptObjectExt) features.add(OBJECT_FEATURE_SCRIPT_EXTENDED);
if (object instanceof DBSDataContainer) {
features.add(OBJECT_FEATURE_DATA_CONTAINER);
if (((DBSDataContainer) object).isFeatureSupported(DBSDataContainer.FEATURE_DATA_FILTER)) {
features.add(OBJECT_FEATURE_DATA_CONTAINER_SUPPORTS_FILTERS);
}
}
if (object instanceof DBSDataManipulator) features.add(OBJECT_FEATURE_DATA_MANIPULATOR);
if (object instanceof DBSEntity && object instanceof DBSDataType == false) features.add(OBJECT_FEATURE_ENTITY);
if (object instanceof DBSSchema) features.add(OBJECT_FEATURE_SCHEMA);
if (object instanceof DBSCatalog) features.add(OBJECT_FEATURE_CATALOG);
if (object instanceof DBSObjectContainer) {
features.add("objectContainer");
features.add(OBJECT_FEATURE_OBJECT_CONTAINER);
try {
Class<? extends DBSObject> childType = ((DBSObjectContainer) object).getPrimaryChildType(null);
if (DBSEntity.class.isAssignableFrom(childType)) {
features.add("entityContainer");
features.add(OBJECT_FEATURE_ENTITY_CONTAINER);
}
} catch (Exception e) {
log.error(e);
Expand Down