Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
22f5606c
D
dbeaver
项目概览
suliangchun
/
dbeaver
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dbeaver
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
22f5606c
编写于
7月 19, 2019
作者:
S
Serge Rider
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
#5384 Virtual FKs in ERD
上级
f98ae7e2
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
28 addition
and
5 deletion
+28
-5
plugins/org.jkiss.dbeaver.ext.erd/src/org/jkiss/dbeaver/ext/erd/editor/ERDEditorEmbedded.java
...c/org/jkiss/dbeaver/ext/erd/editor/ERDEditorEmbedded.java
+3
-2
plugins/org.jkiss.dbeaver.ext.erd/src/org/jkiss/dbeaver/ext/erd/model/ERDDecoratorDefault.java
.../org/jkiss/dbeaver/ext/erd/model/ERDDecoratorDefault.java
+3
-2
plugins/org.jkiss.dbeaver.ext.erd/src/org/jkiss/dbeaver/ext/erd/model/ERDEntity.java
...xt.erd/src/org/jkiss/dbeaver/ext/erd/model/ERDEntity.java
+2
-1
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/virtual/DBVUtils.java
...r.model/src/org/jkiss/dbeaver/model/virtual/DBVUtils.java
+20
-0
未找到文件。
plugins/org.jkiss.dbeaver.ext.erd/src/org/jkiss/dbeaver/ext/erd/editor/ERDEditorEmbedded.java
浏览文件 @
22f5606c
...
...
@@ -30,6 +30,7 @@ import org.jkiss.dbeaver.model.exec.DBExecUtils;
import
org.jkiss.dbeaver.model.runtime.DBRProgressMonitor
;
import
org.jkiss.dbeaver.model.runtime.load.DatabaseLoadService
;
import
org.jkiss.dbeaver.model.struct.*
;
import
org.jkiss.dbeaver.model.virtual.DBVUtils
;
import
org.jkiss.dbeaver.runtime.DBWorkbench
;
import
org.jkiss.dbeaver.ui.IActiveWorkbenchPart
;
import
org.jkiss.dbeaver.ui.LoadingJob
;
...
...
@@ -246,7 +247,7 @@ public class ERDEditorEmbedded extends ERDEditorPart implements IDatabaseEditor,
result
.
add
(
rootTable
);
try
{
monitor
.
subTask
(
"Read foreign keys"
);
Collection
<?
extends
DBSEntityAssociation
>
fks
=
rootTable
.
getAssociations
(
monitor
);
Collection
<?
extends
DBSEntityAssociation
>
fks
=
DBVUtils
.
getAllAssociations
(
monitor
,
rootTable
);
if
(
fks
!=
null
)
{
for
(
DBSEntityAssociation
fk
:
fks
)
{
DBSEntity
associatedEntity
=
fk
.
getAssociatedEntity
();
...
...
@@ -264,7 +265,7 @@ public class ERDEditorEmbedded extends ERDEditorPart implements IDatabaseEditor,
}
try
{
monitor
.
subTask
(
"Read references"
);
Collection
<?
extends
DBSEntityAssociation
>
refs
=
rootTable
.
getReferences
(
monitor
);
Collection
<?
extends
DBSEntityAssociation
>
refs
=
DBVUtils
.
getAllReferences
(
monitor
,
rootTable
);
if
(
refs
!=
null
)
{
for
(
DBSEntityAssociation
ref
:
refs
)
{
result
.
add
(
ref
.
getParentObject
());
...
...
plugins/org.jkiss.dbeaver.ext.erd/src/org/jkiss/dbeaver/ext/erd/model/ERDDecoratorDefault.java
浏览文件 @
22f5606c
...
...
@@ -31,6 +31,7 @@ import org.jkiss.dbeaver.ext.erd.editor.ERDEditPartFactory;
import
org.jkiss.dbeaver.model.DBUtils
;
import
org.jkiss.dbeaver.model.runtime.DBRProgressMonitor
;
import
org.jkiss.dbeaver.model.struct.*
;
import
org.jkiss.dbeaver.model.virtual.DBVUtils
;
import
org.jkiss.dbeaver.ui.DBeaverIcons
;
import
org.jkiss.dbeaver.ui.UIIcon
;
import
org.jkiss.utils.CommonUtils
;
...
...
@@ -146,12 +147,12 @@ public class ERDDecoratorDefault implements ERDDecorator {
if
(
attributeVisibility
==
ERDAttributeVisibility
.
KEYS
)
{
keyColumns
=
new
HashSet
<>();
try
{
for
(
DBSEntityAssociation
assoc
:
CommonUtils
.
safeCollection
(
entity
.
getAssociations
(
monitor
)
))
{
for
(
DBSEntityAssociation
assoc
:
DBVUtils
.
getAllAssociations
(
monitor
,
entity
))
{
if
(
assoc
instanceof
DBSEntityReferrer
)
{
keyColumns
.
addAll
(
DBUtils
.
getEntityAttributes
(
monitor
,
(
DBSEntityReferrer
)
assoc
));
}
}
for
(
DBSEntityConstraint
constraint
:
CommonUtils
.
safeCollection
(
entity
.
getConstraints
(
monitor
)
))
{
for
(
DBSEntityConstraint
constraint
:
DBVUtils
.
getAllConstraints
(
monitor
,
entity
))
{
if
(
constraint
instanceof
DBSEntityReferrer
)
{
keyColumns
.
addAll
(
DBUtils
.
getEntityAttributes
(
monitor
,
(
DBSEntityReferrer
)
constraint
));
}
...
...
plugins/org.jkiss.dbeaver.ext.erd/src/org/jkiss/dbeaver/ext/erd/model/ERDEntity.java
浏览文件 @
22f5606c
...
...
@@ -28,6 +28,7 @@ import org.jkiss.dbeaver.model.DBUtils;
import
org.jkiss.dbeaver.model.runtime.DBRProgressMonitor
;
import
org.jkiss.dbeaver.model.runtime.VoidProgressMonitor
;
import
org.jkiss.dbeaver.model.struct.*
;
import
org.jkiss.dbeaver.model.virtual.DBVUtils
;
import
org.jkiss.utils.CommonUtils
;
import
java.util.*
;
...
...
@@ -156,7 +157,7 @@ public class ERDEntity extends ERDElement<DBSEntity> {
try
{
Set
<
DBSEntityAttribute
>
fkAttrs
=
new
HashSet
<>();
// Make associations
Collection
<?
extends
DBSEntityAssociation
>
fks
=
getObject
().
getAssociations
(
monitor
);
Collection
<?
extends
DBSEntityAssociation
>
fks
=
DBVUtils
.
getAllAssociations
(
monitor
,
getObject
()
);
if
(
fks
!=
null
)
{
for
(
DBSEntityAssociation
fk
:
fks
)
{
if
(
fk
instanceof
DBSEntityReferrer
)
{
...
...
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/virtual/DBVUtils.java
浏览文件 @
22f5606c
...
...
@@ -249,6 +249,26 @@ public abstract class DBVUtils {
return
result
;
}
@NotNull
public
static
List
<
DBSEntityAssociation
>
getAllReferences
(
@NotNull
DBRProgressMonitor
monitor
,
@NotNull
DBSEntity
onEntity
)
throws
DBException
{
List
<
DBSEntityAssociation
>
result
=
new
ArrayList
<>();
final
Collection
<?
extends
DBSEntityAssociation
>
realConstraints
=
onEntity
.
getReferences
(
monitor
);
if
(!
CommonUtils
.
isEmpty
(
realConstraints
))
{
result
.
addAll
(
realConstraints
);
}
/*
DBVEntity vEntity = getVirtualEntity(entity, false);
if (vEntity != null) {
List<DBVEntityForeignKey> vFKs = vEntity.getForeignKeys();
if (!CommonUtils.isEmpty(vFKs)) {
result.addAll(vFKs);
}
}
*/
return
result
;
}
@NotNull
public
static
DBSEntity
getRealEntity
(
@NotNull
DBRProgressMonitor
monitor
,
@NotNull
DBSEntity
entity
)
throws
DBException
{
if
(
entity
instanceof
DBVEntity
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录