Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
cca27a7b
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,发现更多精彩内容 >>
未验证
提交
cca27a7b
编写于
12月 26, 2020
作者:
S
Serge Rider
提交者:
GitHub
12月 26, 2020
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #10802 from dbeaver/roleDDL#9372
#9372 DDL tab to Role added
上级
3f1abe08
9416ed67
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
47 addition
and
2 deletion
+47
-2
plugins/org.jkiss.dbeaver.ext.postgresql.ui/plugin.xml
plugins/org.jkiss.dbeaver.ext.postgresql.ui/plugin.xml
+1
-0
plugins/org.jkiss.dbeaver.ext.postgresql/OSGI-INF/l10n/bundle.properties
...ss.dbeaver.ext.postgresql/OSGI-INF/l10n/bundle.properties
+1
-0
plugins/org.jkiss.dbeaver.ext.postgresql/OSGI-INF/l10n/bundle_de.properties
...dbeaver.ext.postgresql/OSGI-INF/l10n/bundle_de.properties
+1
-0
plugins/org.jkiss.dbeaver.ext.postgresql/OSGI-INF/l10n/bundle_ru.properties
...dbeaver.ext.postgresql/OSGI-INF/l10n/bundle_ru.properties
+1
-0
plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/edit/PostgreTableManagerBase.java
.../dbeaver/ext/postgresql/edit/PostgreTableManagerBase.java
+0
-1
plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreRole.java
...c/org/jkiss/dbeaver/ext/postgresql/model/PostgreRole.java
+43
-1
未找到文件。
plugins/org.jkiss.dbeaver.ext.postgresql.ui/plugin.xml
浏览文件 @
cca27a7b
...
...
@@ -78,6 +78,7 @@
<objectType
name=
"org.jkiss.dbeaver.ext.postgresql.model.PostgreSchema"
/>
<objectType
name=
"org.jkiss.dbeaver.ext.postgresql.model.PostgreDataType"
/>
<objectType
name=
"org.jkiss.dbeaver.ext.postgresql.model.PostgreTablespace"
/>
<objectType
name=
"org.jkiss.dbeaver.ext.postgresql.model.PostgreRole"
/>
</editor>
<editor
id=
"postgresql.source.ddl"
class=
"org.jkiss.dbeaver.ext.postgresql.ui.editors.PostgreSourceViewEditor"
label=
"%db.editor.ddl.name"
description=
"%db.editor.ddl.description"
icon=
"#sql_text"
position=
"additions_middle"
...
...
plugins/org.jkiss.dbeaver.ext.postgresql/OSGI-INF/l10n/bundle.properties
浏览文件 @
cca27a7b
...
...
@@ -85,6 +85,7 @@ meta.org.jkiss.dbeaver.ext.postgresql.model.PostgreRole.superUser.name=Super Use
meta.org.jkiss.dbeaver.ext.postgresql.model.PostgreRole.superUser.description
=
meta.org.jkiss.dbeaver.ext.postgresql.model.PostgreRole.validUntil.name
=
Valid Until
meta.org.jkiss.dbeaver.ext.postgresql.model.PostgreRole.validUntil.description
=
meta.org.jkiss.dbeaver.ext.postgresql.model.PostgreRole.objectDefinitionText.name
=
Source
meta.org.jkiss.dbeaver.ext.postgresql.model.PostgreRoleMember.owner.name
=
Owner
meta.org.jkiss.dbeaver.ext.postgresql.model.PostgreRoleMember.member.name
=
Role
meta.org.jkiss.dbeaver.ext.postgresql.model.PostgreRoleMember.grantor.name
=
Grantor
...
...
plugins/org.jkiss.dbeaver.ext.postgresql/OSGI-INF/l10n/bundle_de.properties
浏览文件 @
cca27a7b
...
...
@@ -263,6 +263,7 @@ meta.org.jkiss.dbeaver.ext.postgresql.model.PostgreRole.password.name = Password
meta.org.jkiss.dbeaver.ext.postgresql.model.PostgreRole.replication.name
=
Nachbildung
meta.org.jkiss.dbeaver.ext.postgresql.model.PostgreRole.superUser.name
=
Super User
meta.org.jkiss.dbeaver.ext.postgresql.model.PostgreRole.validUntil.name
=
G
\u
00FCltig bis
meta.org.jkiss.dbeaver.ext.postgresql.model.PostgreRole.objectDefinitionText.name
=
Quelle
meta.org.jkiss.dbeaver.ext.postgresql.model.PostgreRoleMember.adminOption.name
=
Administrationsoption
meta.org.jkiss.dbeaver.ext.postgresql.model.PostgreRoleMember.grantor.name
=
Stifter
meta.org.jkiss.dbeaver.ext.postgresql.model.PostgreRoleMember.member.name
=
Rolle
...
...
plugins/org.jkiss.dbeaver.ext.postgresql/OSGI-INF/l10n/bundle_ru.properties
浏览文件 @
cca27a7b
...
...
@@ -351,6 +351,7 @@ meta.org.jkiss.dbeaver.ext.postgresql.model.PostgreRole.superUser.description =
meta.org.jkiss.dbeaver.ext.postgresql.model.PostgreRole.superUser.name
=
\u0421\u0443\u
043F
\u0435\u0440\u
043F
\u
043E
\u
043B
\u
044C
\u0437\u
043E
\u0432\u0430\u0442\u0435\u
043B
\u
044C
meta.org.jkiss.dbeaver.ext.postgresql.model.PostgreRole.validUntil.description
=
\u0421\u0440\u
043E
\u
043A
\u0434\u0435\u0439\u0441\u0442\u0432\u0438\u
044F
\u
043F
\u0430\u0440\u
043E
\u
043B
\u
044F (
\u0438\u0441\u
043F
\u
043E
\u
043B
\u
044C
\u0437\u0443\u0435\u0442\u0441\u
044F
\u0442\u
043E
\u
043B
\u
044C
\u
043A
\u
043E
\u
043F
\u0440\u0438
\u0430\u0443\u0442\u0435\u
043D
\u0442\u0438\u0444\u0438\u
043A
\u0430\u0446\u0438\u0438
\u
043F
\u
043E
\u
043F
\u0430\u0440\u
043E
\u
043B
\u
044E); NULL,
\u0435\u0441\u
043B
\u0438
\u0441\u0440\u
043E
\u
043A
\u0434\u0435\u0439\u0441\u0442\u0432\u0438\u
044F
\u
043D
\u0435
\u
043E
\u0433\u0440\u0430\u
043D
\u0438\u0447\u0435\u
043D
meta.org.jkiss.dbeaver.ext.postgresql.model.PostgreRole.validUntil.name
=
\u0414\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u
043B
\u0435\u
043D
\u0434\u
043E
meta.org.jkiss.dbeaver.ext.postgresql.model.PostgreRole.objectDefinitionText.name
=
\u
041E
\u
043F
\u0440\u0435\u0434\u0435\u
043B
\u0435\u
043D
\u0438\u0435
meta.org.jkiss.dbeaver.ext.postgresql.model.PostgreRoleMember.adminOption.name
=
\u0410\u0434\u
043C
\u0438\u
043D
\u0438\u0441\u0442\u0440\u0430\u0442\u0438\u0432\u
043D
\u
044B
\u0435
\u0432\u
043E
\u0437\u
043C
\u
043E
\u0436\u
043D
\u
043E
\u0441\u0442\u0438
meta.org.jkiss.dbeaver.ext.postgresql.model.PostgreRoleMember.grantor.name
=
\u
041F
\u0440\u0430\u0432\u0430
\u0432\u
044B
\u0434\u0430\u
043B
meta.org.jkiss.dbeaver.ext.postgresql.model.PostgreRoleMember.member.name
=
\u0420\u
043E
\u
043B
\u
044C
...
...
plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/edit/PostgreTableManagerBase.java
浏览文件 @
cca27a7b
...
...
@@ -17,7 +17,6 @@
package
org.jkiss.dbeaver.ext.postgresql.edit
;
import
org.jkiss.dbeaver.DBException
;
import
org.jkiss.dbeaver.ext.postgresql.PostgreConstants
;
import
org.jkiss.dbeaver.ext.postgresql.PostgreUtils
;
import
org.jkiss.dbeaver.ext.postgresql.model.*
;
import
org.jkiss.dbeaver.model.DBConstants
;
...
...
plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreRole.java
浏览文件 @
cca27a7b
...
...
@@ -35,6 +35,7 @@ import org.jkiss.dbeaver.model.meta.IPropertyValueValidator;
import
org.jkiss.dbeaver.model.meta.Property
;
import
org.jkiss.dbeaver.model.runtime.DBRProgressMonitor
;
import
org.jkiss.dbeaver.model.struct.DBSObject
;
import
org.jkiss.utils.StandardConstants
;
import
java.sql.ResultSet
;
import
java.sql.SQLException
;
...
...
@@ -43,7 +44,7 @@ import java.util.*;
/**
* PostgreRole
*/
public
class
PostgreRole
implements
PostgreObject
,
PostgrePrivilegeOwner
,
DBPPersistedObject
,
DBPSaveableObject
,
DBPRefreshableObject
,
DBPNamedObject2
,
DBARole
,
DBAUser
{
public
class
PostgreRole
implements
PostgreObject
,
PostgrePrivilegeOwner
,
DBPPersistedObject
,
DBPSaveableObject
,
DBPRefreshableObject
,
DBPNamedObject2
,
DBARole
,
DBAUser
,
PostgreScriptObject
{
public
static
final
String
CAT_SETTINGS
=
"Settings"
;
public
static
final
String
CAT_FLAGS
=
"Flags"
;
...
...
@@ -67,6 +68,8 @@ public class PostgreRole implements PostgreObject, PostgrePrivilegeOwner, DBPPer
private
MembersCache
membersCache
=
new
MembersCache
(
true
);
private
MembersCache
belongsCache
=
new
MembersCache
(
false
);
private
final
String
lineBreak
=
System
.
getProperty
(
StandardConstants
.
ENV_LINE_SEPARATOR
);
static
class
MembersCache
extends
JDBCObjectCache
<
PostgreRole
,
PostgreRoleMember
>
{
private
final
boolean
members
;
MembersCache
(
boolean
members
)
{
...
...
@@ -292,6 +295,45 @@ public class PostgreRole implements PostgreObject, PostgrePrivilegeOwner, DBPPer
return
this
;
}
@Override
public
void
setObjectDefinitionText
(
String
sourceText
)
throws
DBException
{
}
@Override
public
String
getObjectDefinitionText
(
DBRProgressMonitor
monitor
,
Map
<
String
,
Object
>
options
)
throws
DBException
{
final
String
lineBreak
=
System
.
getProperty
(
StandardConstants
.
ENV_LINE_SEPARATOR
);
StringBuilder
ddl
=
new
StringBuilder
();
ddl
.
append
(
"-- DROP ROLE "
).
append
(
getName
()).
append
(
";\n\n"
);
//$NON-NLS-1$ //$NON-NLS-2$
ddl
.
append
(
"CREATE ROLE "
).
append
(
getName
()).
append
(
" WITH "
);
addOptionToDDL
(
ddl
,
isSuperUser
(),
"SUPERUSER"
);
addOptionToDDL
(
ddl
,
isCreateDatabase
(),
"CREATEDB"
);
addOptionToDDL
(
ddl
,
isCreateRole
(),
"CREATEROLE"
);
addOptionToDDL
(
ddl
,
isInherit
(),
"INHERIT"
);
addOptionToDDL
(
ddl
,
isCanLogin
(),
"LOGIN"
);
addOptionToDDL
(
ddl
,
isReplication
(),
"REPLICATION"
);
addOptionToDDL
(
ddl
,
isBypassRls
(),
"BYPASSRLS"
);
if
(
getConnLimit
()
>
0
)
{
ddl
.
append
(
lineBreak
);
ddl
.
append
(
"\tCONNECTION LIMIT "
).
append
(
getClass
());
}
if
(
getValidUntil
()
!=
null
)
{
ddl
.
append
(
lineBreak
);
ddl
.
append
(
"\tVALID UNTIL '"
).
append
(
getValidUntil
().
toString
()).
append
(
"'"
);
}
ddl
.
append
(
";"
);
return
ddl
.
toString
();
}
private
void
addOptionToDDL
(
StringBuilder
ddl
,
boolean
isOptionOn
,
String
option
)
{
ddl
.
append
(
lineBreak
).
append
(
"\t"
);
if
(
isOptionOn
)
{
ddl
.
append
(
option
);
}
else
{
ddl
.
append
(
"NO"
).
append
(
option
);
}
}
@Override
public
List
<
PostgrePrivilege
>
getPrivileges
(
DBRProgressMonitor
monitor
,
boolean
includeNestedObjects
)
{
try
(
JDBCSession
session
=
DBUtils
.
openMetaSession
(
monitor
,
this
,
"Read role privileges"
))
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录