Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
b81fe2d6
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,发现更多精彩内容 >>
未验证
提交
b81fe2d6
编写于
4月 26, 2021
作者:
S
Serge Rider
提交者:
GitHub
4月 26, 2021
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #12230 from dbeaver/oracle-split-procedures-functions#11408
#11408 Separate procedures and functions
上级
1000d7e7
f60c9ef0
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
81 addition
and
13 deletion
+81
-13
plugins/org.jkiss.dbeaver.ext.db2/plugin.xml
plugins/org.jkiss.dbeaver.ext.db2/plugin.xml
+2
-2
plugins/org.jkiss.dbeaver.ext.hana/plugin.xml
plugins/org.jkiss.dbeaver.ext.hana/plugin.xml
+2
-2
plugins/org.jkiss.dbeaver.ext.oracle/OSGI-INF/l10n/bundle.properties
....jkiss.dbeaver.ext.oracle/OSGI-INF/l10n/bundle.properties
+2
-0
plugins/org.jkiss.dbeaver.ext.oracle/OSGI-INF/l10n/bundle_ru.properties
...iss.dbeaver.ext.oracle/OSGI-INF/l10n/bundle_ru.properties
+4
-2
plugins/org.jkiss.dbeaver.ext.oracle/plugin.xml
plugins/org.jkiss.dbeaver.ext.oracle/plugin.xml
+31
-3
plugins/org.jkiss.dbeaver.ext.oracle/src/org/jkiss/dbeaver/ext/oracle/model/OraclePackage.java
...src/org/jkiss/dbeaver/ext/oracle/model/OraclePackage.java
+22
-4
plugins/org.jkiss.dbeaver.ext.oracle/src/org/jkiss/dbeaver/ext/oracle/model/OracleSchema.java
.../src/org/jkiss/dbeaver/ext/oracle/model/OracleSchema.java
+18
-0
未找到文件。
plugins/org.jkiss.dbeaver.ext.db2/plugin.xml
浏览文件 @
b81fe2d6
...
...
@@ -156,12 +156,12 @@
visibleIf=
"object.dataSource.atLeastV9_7"
>
<items
label=
"%tree.module.node.name"
path=
"module"
property=
"modules"
icon=
"#module"
>
<items
label=
"%tree.conditions.node.name"
path=
"condition"
property=
"conditions"
icon=
"#condition"
navigable=
"false"
/>
<folder
type=
"org.jkiss.dbeaver.ext.db2.model.DB2Routine"
label=
"%tree.functions.node.name"
icon=
"icons/udf.gif"
description=
"Functions"
>
<folder
id=
"functions"
type=
"org.jkiss.dbeaver.ext.db2.model.DB2Routine"
label=
"%tree.functions.node.name"
icon=
"icons/udf.gif"
description=
"Functions"
>
<items
label=
"%tree.functions.node.name"
path=
"function"
property=
"functions"
icon=
"#procedure"
navigable=
"true"
>
<items
label=
"%tree.arguments.node.name"
itemLabel=
"%tree.argument.node.name"
path=
"parameter"
property=
"parameters"
icon=
"#argument"
navigable=
"true"
inline=
"false"
/>
</items>
</folder>
<folder
type=
"org.jkiss.dbeaver.ext.db2.model.DB2Routine"
label=
"%tree.procedures.node.name"
icon=
"#procedures"
description=
"Procedures"
>
<folder
id=
"procedures"
type=
"org.jkiss.dbeaver.ext.db2.model.DB2Routine"
label=
"%tree.procedures.node.name"
icon=
"#procedures"
description=
"Procedures"
>
<items
label=
"%tree.procedures.node.name"
path=
"procedure"
property=
"procedures"
icon=
"#procedure"
navigable=
"true"
>
<items
label=
"%tree.arguments.node.name"
itemLabel=
"%tree.argument.node.name"
path=
"parameter"
property=
"parameters"
icon=
"#argument"
navigable=
"true"
inline=
"false"
/>
</items>
...
...
plugins/org.jkiss.dbeaver.ext.hana/plugin.xml
浏览文件 @
b81fe2d6
...
...
@@ -67,7 +67,7 @@
<items
icon=
"#column"
label=
"%tree.index_columns.node.name"
itemLabel=
"%tree.column.node.name"
path=
"column"
property=
"attributeReferences"
inline=
"true"
navigable=
"false"
virtual=
"true"
/>
</items>
</folder>
<folder
type=
"org.jkiss.dbeaver.ext.hana.model.HANAProcedure"
label=
"%tree.procedures.node.name"
icon=
"#procedures"
>
<folder
id=
"procedures"
type=
"org.jkiss.dbeaver.ext.hana.model.HANAProcedure"
label=
"%tree.procedures.node.name"
icon=
"#procedures"
>
<items
label=
"%tree.procedures.node.name"
itemLabel=
"%tree.procedure.node.name"
path=
"procedure"
property=
"proceduresOnly"
icon=
"#procedure"
>
<folder
label=
"%tree.procedure_columns.node.name"
icon=
"#columns"
description=
"%tree.procedure_columns.node.name"
>
<items
label=
"%tree.procedure_columns.node.name"
itemLabel=
"%tree.column.node.name"
path=
"column"
property=
"parameters"
navigable=
"false"
/>
...
...
@@ -77,7 +77,7 @@
</folder>
</items>
</folder>
<folder
type=
"org.jkiss.dbeaver.ext.hana.model.HANAProcedure"
label=
"%tree.functions.node.name"
icon=
"#functions"
>
<folder
id=
"functions"
type=
"org.jkiss.dbeaver.ext.hana.model.HANAProcedure"
label=
"%tree.functions.node.name"
icon=
"#functions"
>
<items
label=
"%tree.functions.node.name"
itemLabel=
"%tree.function.node.name"
path=
"function"
property=
"functionsOnly"
icon=
"#function"
>
<folder
label=
"%tree.function_columns.node.name"
icon=
"#columns"
description=
"%tree.procedure_columns.node.name"
>
<items
label=
"%tree.function_columns.node.name"
itemLabel=
"%tree.column.node.name"
path=
"column"
property=
"parameters"
navigable=
"false"
/>
...
...
plugins/org.jkiss.dbeaver.ext.oracle/OSGI-INF/l10n/bundle.properties
浏览文件 @
b81fe2d6
...
...
@@ -59,6 +59,8 @@ tree.packages.node.name=Packages
tree.package.node.name
=
Package
tree.procedures.node.name
=
Procedures
tree.procedure.node.name
=
Procedure
tree.functions.node.name
=
Functions
tree.function.node.name
=
Function
tree.synonyms.node.name
=
Synonyms
tree.synonym.node.name
=
Synonym
tree.database_links.node.name
=
Database Links
...
...
plugins/org.jkiss.dbeaver.ext.oracle/OSGI-INF/l10n/bundle_ru.properties
浏览文件 @
b81fe2d6
...
...
@@ -42,6 +42,8 @@ tree.packages.node.name=\u041F\u0430\u043A\u0435\u0442\u044B
tree.package.node.name
=
\u
041F
\u0430\u
043A
\u0435\u0442
tree.procedures.node.name
=
\u
041F
\u0440\u
043E
\u0446\u0435\u0434\u0443\u0440\u
044B
tree.procedure.node.name
=
\u
041F
\u0440\u
043E
\u0446\u0435\u0434\u0443\u0440\u0430
tree.functions.node.name
=
\u0424\u0443\u
043D
\u
043A
\u0446\u0438\u0438
tree.function.node.name
=
\u0424\u0443\u
043D
\u
043A
\u0446\u0438\u
044F
tree.synonyms.node.name
=
\u0421\u0438\u
043D
\u
043E
\u
043D
\u0438\u
043C
\u
044B
tree.synonym.node.name
=
\u0421\u0438\u
043D
\u
043E
\u
043D
\u0438\u
043C
tree.database_links.node.name
=
\u0421\u0441\u
044B
\u
043B
\u
043A
\u0438
\u
043D
\u0430
\u0411\u0414
...
...
@@ -231,8 +233,8 @@ meta.org.jkiss.dbeaver.ext.oracle.model.OracleTable.nested.name=\u0412\u043B\u04
meta.org.jkiss.dbeaver.ext.oracle.model.OracleTable.nested.description
=
\u
041E
\u0431\u
043E
\u0437\u
043D
\u0430\u0447\u0430\u0435\u0442
,
\u0447\u0442\u
043E
\u0442\u0430\u0431\u
043B
\u0438\u0446\u0430
-
\u0432\u
043B
\u
043E
\u0436\u0435\u
043D
\u
043D
\u0430\u
044F
meta.org.jkiss.dbeaver.ext.oracle.model.OracleTableBase.name.name
=
\u0418\u
043C
\u
044F
meta.org.jkiss.dbeaver.ext.oracle.model.OracleTableBase.name.description
=
\u0418\u
043C
\u
044F
\u0442\u0430\u0431\u
043B
\u0438\u0446\u
044B
meta.org.jkiss.dbeaver.ext.oracle.model.OracleTableBase.comment.name
=
\u
041A
\u
043E
\u
043C
\u043
5\u
043D
\u0442
\u0440\u0438\u0439
meta.org.jkiss.dbeaver.ext.oracle.model.OracleTableBase.comment.description
=
\u
041A
\u
043E
\u
043C
\u043
5\u
043D
\u0442
\u0440\u0438\u0439
\u0442\u0430\u0431\u
043B
\u0438\u0446\u
044B
meta.org.jkiss.dbeaver.ext.oracle.model.OracleTableBase.comment.name
=
\u
041A
\u
043E
\u
043C
\u
043
C
\u0435\u
043D
\u0442\u0430
\u0440\u0438\u0439
meta.org.jkiss.dbeaver.ext.oracle.model.OracleTableBase.comment.description
=
\u
041A
\u
043E
\u
043C
\u
043
C
\u0435\u
043D
\u0442\u0430
\u0440\u0438\u0439
\u0442\u0430\u0431\u
043B
\u0438\u0446\u
044B
meta.org.jkiss.dbeaver.ext.oracle.model.OracleTableBase.objectState.name
=
\u0421\u0442\u0430\u0442\u0443\u0441
meta.org.jkiss.dbeaver.ext.oracle.model.OracleTableColumn.fullTypeName.name
=
\u0422\u0438\u
043F
meta.org.jkiss.dbeaver.ext.oracle.model.OracleTableColumn.fullTypeName.description
=
\u0422\u0438\u
043F
\u0434\u0430\u
043D
\u
043D
\u
044B
\u0445
\u
043A
\u
043E
\u
043B
\u
043E
\u
043D
\u
043A
\u0438
...
...
plugins/org.jkiss.dbeaver.ext.oracle/plugin.xml
浏览文件 @
b81fe2d6
...
...
@@ -165,7 +165,22 @@
</folder>
<folder
type=
"org.jkiss.dbeaver.ext.oracle.model.OraclePackage"
label=
"%tree.packages.node.name"
icon=
"#packages"
description=
"Packages"
>
<items
label=
"%tree.package.node.name"
path=
"package"
property=
"packages"
icon=
"#package"
>
<items
label=
"%tree.procedures.node.name"
itemLabel=
"%tree.procedure.node.name"
path=
"procedure"
property=
"procedures"
icon=
"#procedure"
visibleIf=
"object.dataSource.isAtLeastV10()"
>
<items
label=
"%tree.procedures.node.name"
itemLabel=
"%tree.procedure.node.name"
path=
"procedure"
property=
"proceduresOnly"
icon=
"#procedure"
visibleIf=
"object.dataSource.isAtLeastV10()"
>
<handler
action=
"open"
command=
"org.jkiss.dbeaver.ext.oracle.code.package.navigate"
/>
<!-- Proc arguments. Not inline because arguments reading is expensive -->
<items
label=
"%tree.arguments.node.name"
itemLabel=
"%tree.argument.node.name"
path=
"argument"
property=
"parameters"
icon=
"#argument"
navigable=
"false"
inline=
"false"
>
<items
label=
"%tree.attributes.node.name"
itemLabel=
"%tree.attribute.node.name"
path=
"attribute"
property=
"attributes"
icon=
"#attribute"
navigable=
"false"
inline=
"true"
id=
"ProcedureArgumentAttributes"
visibleIf=
"object.hasAttributes()"
>
<items
ref=
"ProcedureArgumentAttributes"
/>
</items>
</items>
<folder
type=
"org.jkiss.dbeaver.ext.oracle.model.OracleDependency"
label=
"%tree.dependencies.node.name"
description=
"Procedure dependency/dependent objects"
>
<items
label=
"%tree.dependency.node.name"
path=
"dependency"
property=
"dependencies"
icon=
"platform:/plugin/org.jkiss.dbeaver.ui/icons/file/link.png"
>
<items
label=
"%tree.dependencies.node.name"
path=
"entry"
property=
"entries"
navigable=
"false"
inline=
"true"
>
</items>
</items>
</folder>
</items>
<items
label=
"%tree.functions.node.name"
itemLabel=
"%tree.function.node.name"
path=
"function"
property=
"functionsOnly"
icon=
"#function"
visibleIf=
"object.dataSource.isAtLeastV10()"
>
<handler
action=
"open"
command=
"org.jkiss.dbeaver.ext.oracle.code.package.navigate"
/>
<!-- Proc arguments. Not inline because arguments reading is expensive -->
<items
label=
"%tree.arguments.node.name"
itemLabel=
"%tree.argument.node.name"
path=
"argument"
property=
"parameters"
icon=
"#argument"
navigable=
"false"
inline=
"false"
>
...
...
@@ -188,8 +203,8 @@
</folder>
</items>
</folder>
<folder
type=
"org.jkiss.dbeaver.ext.oracle.model.OracleProcedureStandalone"
label=
"%tree.procedures.node.name"
icon=
"#procedures"
description=
"Procedures"
>
<items
label=
"%tree.procedure.node.name"
itemLabel=
"%tree.procedure.node.name"
path=
"procedure"
property=
"procedures"
icon=
"#procedure"
id=
"Procedure"
>
<folder
id=
"procedures"
type=
"org.jkiss.dbeaver.ext.oracle.model.OracleProcedureStandalone"
label=
"%tree.procedures.node.name"
icon=
"#procedures"
description=
"Procedures"
>
<items
label=
"%tree.procedure.node.name"
itemLabel=
"%tree.procedure.node.name"
path=
"procedure"
property=
"procedures
Only
"
icon=
"#procedure"
id=
"Procedure"
>
<items
label=
"%tree.arguments.node.name"
itemLabel=
"%tree.argument.node.name"
path=
"argument"
property=
"parameters"
icon=
"#argument"
navigable=
"false"
inline=
"false"
>
<items
ref=
"ProcedureArgumentAttributes"
/>
</items>
...
...
@@ -201,6 +216,19 @@
</folder>
</items>
</folder>
<folder
id=
"functions"
type=
"org.jkiss.dbeaver.ext.oracle.model.OracleProcedureStandalone"
label=
"%tree.functions.node.name"
icon=
"#functions"
description=
"Functions"
>
<items
label=
"%tree.function.node.name"
itemLabel=
"%tree.function.node.name"
path=
"function"
property=
"functionsOnly"
icon=
"#function"
id=
"Function"
>
<items
label=
"%tree.arguments.node.name"
itemLabel=
"%tree.argument.node.name"
path=
"argument"
property=
"parameters"
icon=
"#argument"
navigable=
"false"
inline=
"false"
>
<items
ref=
"ProcedureArgumentAttributes"
/>
</items>
<folder
type=
"org.jkiss.dbeaver.ext.oracle.model.OracleDependency"
label=
"%tree.dependencies.node.name"
description=
"Function dependency/dependent objects"
>
<items
label=
"%tree.dependency.node.name"
path=
"dependency"
property=
"dependencies"
icon=
"platform:/plugin/org.jkiss.dbeaver.ui/icons/file/link.png"
>
<items
label=
"%tree.dependencies.node.name"
path=
"entry"
property=
"entries"
navigable=
"false"
inline=
"true"
>
</items>
</items>
</folder>
</items>
</folder>
<folder
type=
"org.jkiss.dbeaver.ext.oracle.model.OracleSynonym"
label=
"%tree.synonyms.node.name"
icon=
"#synonyms"
description=
"Synonyms"
>
<items
label=
"%tree.synonym.node.name"
path=
"synonym"
property=
"synonyms"
icon=
"#synonym"
/>
</folder>
...
...
plugins/org.jkiss.dbeaver.ext.oracle/src/org/jkiss/dbeaver/ext/oracle/model/OraclePackage.java
浏览文件 @
b81fe2d6
...
...
@@ -40,11 +40,13 @@ import org.jkiss.dbeaver.model.struct.DBSObjectContainer;
import
org.jkiss.dbeaver.model.struct.DBSObjectState
;
import
org.jkiss.dbeaver.model.struct.rdb.DBSPackage
;
import
org.jkiss.dbeaver.model.struct.rdb.DBSProcedureContainer
;
import
org.jkiss.dbeaver.model.struct.rdb.DBSProcedureType
;
import
org.jkiss.utils.CommonUtils
;
import
java.sql.ResultSet
;
import
java.sql.SQLException
;
import
java.util.*
;
import
java.util.stream.Collectors
;
/**
* GenericProcedure
...
...
@@ -116,13 +118,29 @@ public class OraclePackage extends OracleSchemaObject
}
@Association
public
Collection
<
Oracle
ProcedurePackaged
>
getProcedures
(
DBRProgressMonitor
monitor
)
throws
DBException
{
return
proceduresCache
.
getAllObjects
(
monitor
,
this
);
public
Collection
<
Oracle
DependencyGroup
>
getDependencies
(
DBRProgressMonitor
monitor
)
{
return
OracleDependencyGroup
.
of
(
this
);
}
@Association
public
Collection
<
OracleDependencyGroup
>
getDependencies
(
DBRProgressMonitor
monitor
)
{
return
OracleDependencyGroup
.
of
(
this
);
public
Collection
<
OracleProcedurePackaged
>
getProceduresOnly
(
DBRProgressMonitor
monitor
)
throws
DBException
{
return
getProcedures
(
monitor
)
.
stream
()
.
filter
(
proc
->
proc
.
getProcedureType
()
==
DBSProcedureType
.
PROCEDURE
)
.
collect
(
Collectors
.
toList
());
}
@Association
public
Collection
<
OracleProcedurePackaged
>
getFunctionsOnly
(
DBRProgressMonitor
monitor
)
throws
DBException
{
return
getProcedures
(
monitor
)
.
stream
()
.
filter
(
proc
->
proc
.
getProcedureType
()
==
DBSProcedureType
.
FUNCTION
)
.
collect
(
Collectors
.
toList
());
}
@Association
public
Collection
<
OracleProcedurePackaged
>
getProcedures
(
DBRProgressMonitor
monitor
)
throws
DBException
{
return
proceduresCache
.
getAllObjects
(
monitor
,
this
);
}
@Override
...
...
plugins/org.jkiss.dbeaver.ext.oracle/src/org/jkiss/dbeaver/ext/oracle/model/OracleSchema.java
浏览文件 @
b81fe2d6
...
...
@@ -40,6 +40,7 @@ import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
import
org.jkiss.dbeaver.model.struct.DBSEntity
;
import
org.jkiss.dbeaver.model.struct.DBSObject
;
import
org.jkiss.dbeaver.model.struct.rdb.DBSProcedureContainer
;
import
org.jkiss.dbeaver.model.struct.rdb.DBSProcedureType
;
import
org.jkiss.dbeaver.model.struct.rdb.DBSSchema
;
import
org.jkiss.utils.ArrayUtils
;
import
org.jkiss.utils.CommonUtils
;
...
...
@@ -47,6 +48,7 @@ import org.jkiss.utils.CommonUtils;
import
java.sql.ResultSet
;
import
java.sql.SQLException
;
import
java.util.*
;
import
java.util.stream.Collectors
;
/**
* OracleSchema
...
...
@@ -252,6 +254,22 @@ public class OracleSchema extends OracleGlobalObject implements DBSSchema, DBPRe
return
packageCache
.
getAllObjects
(
monitor
,
this
);
}
@Association
public
Collection
<
OracleProcedureStandalone
>
getProceduresOnly
(
DBRProgressMonitor
monitor
)
throws
DBException
{
return
getProcedures
(
monitor
)
.
stream
()
.
filter
(
proc
->
proc
.
getProcedureType
()
==
DBSProcedureType
.
PROCEDURE
)
.
collect
(
Collectors
.
toList
());
}
@Association
public
Collection
<
OracleProcedureStandalone
>
getFunctionsOnly
(
DBRProgressMonitor
monitor
)
throws
DBException
{
return
getProcedures
(
monitor
)
.
stream
()
.
filter
(
proc
->
proc
.
getProcedureType
()
==
DBSProcedureType
.
FUNCTION
)
.
collect
(
Collectors
.
toList
());
}
@Association
public
Collection
<
OracleProcedureStandalone
>
getProcedures
(
DBRProgressMonitor
monitor
)
throws
DBException
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录