Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
cf587cf7
D
dbeaver
项目概览
suliangchun
/
dbeaver
与 Fork 源项目一致
从无法访问的项目Fork
通知
3
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,发现更多精彩内容 >>
提交
cf587cf7
编写于
8月 08, 2019
作者:
S
Serge Rider
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
#6473 Validate container type (only tables containers allowed)
上级
84eac0ef
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
33 addition
and
11 deletion
+33
-11
plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/database/page/DatabaseConsumerPageMapping.java
...s/transfer/database/page/DatabaseConsumerPageMapping.java
+2
-1
plugins/org.jkiss.dbeaver.ext.erd/src/org/jkiss/dbeaver/ext/erd/command/EntityAddCommand.java
...c/org/jkiss/dbeaver/ext/erd/command/EntityAddCommand.java
+2
-1
plugins/org.jkiss.dbeaver.ui/src/org/jkiss/dbeaver/ui/controls/ObjectContainerSelectorPanel.java
...iss/dbeaver/ui/controls/ObjectContainerSelectorPanel.java
+29
-9
未找到文件。
plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/database/page/DatabaseConsumerPageMapping.java
浏览文件 @
cf587cf7
...
...
@@ -624,7 +624,8 @@ public class DatabaseConsumerPageMapping extends ActiveWizardPage<DataTransferWi
rootNode
,
selectedNode
,
new
Class
[]
{
DBSObjectContainer
.
class
,
DBSDataManipulator
.
class
},
new
Class
[]
{
DBSDataManipulator
.
class
},
null
);
new
Class
[]
{
DBSDataManipulator
.
class
},
null
);
if
(
node
!=
null
&&
node
instanceof
DBSWrapper
)
{
DBSObject
object
=
((
DBSWrapper
)
node
).
getObject
();
try
{
...
...
plugins/org.jkiss.dbeaver.ext.erd/src/org/jkiss/dbeaver/ext/erd/command/EntityAddCommand.java
浏览文件 @
cf587cf7
...
...
@@ -79,7 +79,8 @@ public class EntityAddCommand extends Command
dsNode
,
null
,
new
Class
[]{
DBSTable
.
class
},
new
Class
[]{
DBSTable
.
class
},
null
);
new
Class
[]{
DBSTable
.
class
},
null
);
if
(
tableNode
instanceof
DBNDatabaseNode
&&
((
DBNDatabaseNode
)
tableNode
).
getObject
()
instanceof
DBSEntity
)
{
entity
=
ERDUtils
.
makeEntityFromObject
(
monitor
,
...
...
plugins/org.jkiss.dbeaver.ui/src/org/jkiss/dbeaver/ui/controls/ObjectContainerSelectorPanel.java
浏览文件 @
cf587cf7
...
...
@@ -33,11 +33,14 @@ import org.jkiss.code.Nullable;
import
org.jkiss.dbeaver.DBException
;
import
org.jkiss.dbeaver.Log
;
import
org.jkiss.dbeaver.model.DBIcon
;
import
org.jkiss.dbeaver.model.DBPObject
;
import
org.jkiss.dbeaver.model.DBUtils
;
import
org.jkiss.dbeaver.model.app.DBPProject
;
import
org.jkiss.dbeaver.model.navigator.DBNDatabaseNode
;
import
org.jkiss.dbeaver.model.navigator.DBNModel
;
import
org.jkiss.dbeaver.model.navigator.DBNNode
;
import
org.jkiss.dbeaver.model.navigator.DBNProject
;
import
org.jkiss.dbeaver.model.navigator.*
;
import
org.jkiss.dbeaver.model.navigator.meta.DBXTreeItem
;
import
org.jkiss.dbeaver.model.runtime.VoidProgressMonitor
;
import
org.jkiss.dbeaver.model.struct.DBSEntity
;
import
org.jkiss.dbeaver.model.struct.DBSObject
;
import
org.jkiss.dbeaver.model.struct.DBSObjectContainer
;
import
org.jkiss.dbeaver.model.struct.rdb.DBSSchema
;
import
org.jkiss.dbeaver.runtime.DBWorkbench
;
...
...
@@ -129,12 +132,29 @@ public abstract class ObjectContainerSelectorPanel extends Composite
rootNode
.
getDatabases
(),
selectedNode
,
new
Class
[]{
DBSObjectContainer
.
class
},
n
ull
,
//n
ew Class[] { DBSObjectContainer.class },
new
Class
[]{
DBSSchema
.
class
});
new
Class
[]
{
DBSObjectContainer
.
class
},
new
Class
[]{
DBSSchema
.
class
});
if
(
node
instanceof
DBNDatabaseNode
)
{
setSelectedNode
((
DBNDatabaseNode
)
node
);
addNodeToHistory
((
DBNDatabaseNode
)
node
);
saveHistory
();
DBPObject
nodeObject
=
DBUtils
.
getPublicObject
(((
DBNDatabaseNode
)
node
).
getObject
());
if
(
nodeObject
instanceof
DBSObjectContainer
)
{
try
{
Class
<?>
childrenClass
=
((
DBSObjectContainer
)
nodeObject
).
getChildType
(
new
VoidProgressMonitor
());
if
(
childrenClass
!=
null
)
{
if
(!
DBSEntity
.
class
.
isAssignableFrom
(
childrenClass
))
{
// Upper level of container
UIUtils
.
showMessageBox
(
getShell
(),
"Bad container node"
,
"You can select only table container (e.g. schema)."
,
SWT
.
ICON_ERROR
);
}
else
{
setSelectedNode
((
DBNDatabaseNode
)
node
);
addNodeToHistory
((
DBNDatabaseNode
)
node
);
saveHistory
();
}
}
else
{
throw
new
DBException
(
"Can't determine container child objects"
);
}
}
catch
(
DBException
e
)
{
DBWorkbench
.
getPlatformUI
().
showError
(
"Bad container node"
,
"Error determining container elements type"
,
e
);
}
}
}
}
};
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录