提交 0267edd1 编写于 作者: S Serge Rider

Generic data types in navigator

上级 dcab30e4
......@@ -29,6 +29,8 @@ tree.sequences.node.name=Sequences
tree.sequence.node.name=Sequence
tree.triggers.node.name=Triggers
tree.trigger.node.name=Trigger
tree.dataTypes.node.name=Data Types
tree.dataType.node.name=Data Type
editor.source.name=Source
......
......@@ -98,6 +98,9 @@
<folder type="org.jkiss.dbeaver.ext.generic.model.GenericTrigger" label="%tree.triggers.node.name" icon="#triggers" description="Global triggers" visibleIf="object.dataSource.metaModel.supportsDatabaseTriggers(object.dataSource)">
<items label="%tree.trigger.node.name" path="trigger" property="triggers" icon="#trigger"/>
</folder>
<folder type="org.jkiss.dbeaver.model.struct.DBSDataType" label="%tree.dataTypes.node.name" icon="#data_types" description="Global data types">
<items label="%tree.dataType.node.name" path="dataType" property="dataTypes" icon="#data_type"/>
</folder>
</items>
</items>
</tree>
......
......@@ -914,6 +914,10 @@ public class GenericDataSource extends JDBCDataSource
return position == null ? null : new ErrorPosition[] { position };
}
public Collection<? extends DBSDataType> getDataTypes(DBRProgressMonitor monitor) throws DBException {
return dataTypeCache.getAllObjects(monitor, this);
}
@Override
public Collection<? extends DBSDataType> getLocalDataTypes()
{
......
......@@ -22,7 +22,9 @@ import org.jkiss.dbeaver.Log;
import org.jkiss.dbeaver.model.DBPEvaluationContext;
import org.jkiss.dbeaver.model.DBPRefreshableObject;
import org.jkiss.dbeaver.model.DBUtils;
import org.jkiss.dbeaver.model.meta.Association;
import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
import org.jkiss.dbeaver.model.struct.DBSDataType;
import org.jkiss.dbeaver.model.struct.DBSObject;
import org.jkiss.utils.CommonUtils;
......@@ -315,6 +317,11 @@ public abstract class GenericObjectContainer implements GenericStructContainer,D
return triggers;
}
@Association
public Collection<? extends DBSDataType> getDataTypes(DBRProgressMonitor monitor) throws DBException {
return getDataSource().getDataTypes(monitor);
}
@Override
public Collection<? extends DBSObject> getChildren(@NotNull DBRProgressMonitor monitor)
throws DBException
......
......@@ -18,7 +18,9 @@ package org.jkiss.dbeaver.ext.generic.model;
import org.jkiss.code.NotNull;
import org.jkiss.dbeaver.DBException;
import org.jkiss.dbeaver.model.meta.Association;
import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
import org.jkiss.dbeaver.model.struct.DBSDataType;
import org.jkiss.dbeaver.model.struct.DBSObject;
import org.jkiss.dbeaver.model.struct.DBSObjectContainer;
import org.jkiss.dbeaver.model.struct.rdb.DBSProcedureContainer;
......@@ -70,4 +72,7 @@ public interface GenericStructContainer extends DBSObjectContainer, DBSProcedure
Collection<? extends GenericTrigger> getTriggers(DBRProgressMonitor monitor) throws DBException;
Collection<? extends DBSDataType> getDataTypes(DBRProgressMonitor monitor) throws DBException;
}
......@@ -98,6 +98,13 @@ public class GenericTableColumn extends JDBCTableColumn<GenericTable> implements
return charLength;
}
@Override
@Property(viewable = true, editable = true, valueRenderer = DBPositiveNumberTransformer.class, order = 41)
public int getScale()
{
return super.getScale();
}
@Override
@Property(viewable = true, order = 51)
public boolean isAutoGenerated()
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册