Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
9527abdb
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,发现更多精彩内容 >>
提交
9527abdb
编写于
3月 28, 2018
作者:
S
serge-rider
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
#3206 PG: function permissions model
上级
2c9ee177
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
36 addition
and
19 deletion
+36
-19
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/LoadingJob.java
...iss.dbeaver.core/src/org/jkiss/dbeaver/ui/LoadingJob.java
+5
-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
+31
-18
未找到文件。
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/LoadingJob.java
浏览文件 @
9527abdb
...
...
@@ -123,7 +123,11 @@ public class LoadingJob<RESULT> extends AbstractJob {
@Override
public
void
run
()
{
visualizer
.
completeLoading
(
innerResult
);
try
{
visualizer
.
completeLoading
(
innerResult
);
}
catch
(
Throwable
e
)
{
log
.
debug
(
e
);
}
if
(
innerError
!=
null
)
{
log
.
debug
(
innerError
);
...
...
plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreRole.java
浏览文件 @
9527abdb
...
...
@@ -284,30 +284,43 @@ public class PostgreRole implements PostgreObject, PostgrePermissionsOwner, DBPP
@Override
public
Collection
<
PostgrePermission
>
getPermissions
(
DBRProgressMonitor
monitor
)
throws
DBException
{
try
(
JDBCSession
session
=
DBUtils
.
openMetaSession
(
monitor
,
getDataSource
(),
"Read role privileges"
))
{
List
<
PostgrePermission
>
permissions
=
new
ArrayList
<>();
try
(
JDBCPreparedStatement
dbStat
=
session
.
prepareStatement
(
"SELECT * FROM information_schema.table_privileges WHERE table_catalog=? AND grantee=?"
))
{
dbStat
.
setString
(
1
,
getDatabase
().
getName
());
dbStat
.
setString
(
2
,
getName
());
try
(
JDBCResultSet
dbResult
=
dbStat
.
executeQuery
())
{
Map
<
String
,
List
<
PostgrePrivilege
>>
privs
=
new
LinkedHashMap
<>();
while
(
dbResult
.
next
())
{
PostgrePrivilege
privilege
=
new
PostgrePrivilege
(
PostgrePrivilege
.
Kind
.
TABLE
,
dbResult
);
String
tableId
=
privilege
.
getObjectSchema
()
+
"."
+
privilege
.
getObjectName
();
List
<
PostgrePrivilege
>
privList
=
privs
.
computeIfAbsent
(
tableId
,
k
->
new
ArrayList
<>());
privList
.
add
(
privilege
);
}
// Pack to permission list
List
<
PostgrePermission
>
result
=
new
ArrayList
<>(
privs
.
size
());
for
(
List
<
PostgrePrivilege
>
priv
:
privs
.
values
())
{
result
.
add
(
new
PostgreRolePermission
(
this
,
PostgrePrivilege
.
Kind
.
TABLE
,
priv
.
get
(
0
).
getObjectSchema
(),
priv
.
get
(
0
).
getObjectName
(),
priv
));
}
Collections
.
sort
(
result
);
return
result
;
}
}
catch
(
SQLException
e
)
{
throw
new
DBException
(
e
,
getDataSource
());
permissions
.
addAll
(
getRolePermissions
(
this
,
PostgrePrivilege
.
Kind
.
TABLE
,
dbStat
));
}
try
(
JDBCPreparedStatement
dbStat
=
session
.
prepareStatement
(
"SELECT * FROM information_schema.routine_privileges WHERE specific_catalog=? AND grantee=?"
))
{
dbStat
.
setString
(
1
,
getDatabase
().
getName
());
dbStat
.
setString
(
2
,
getName
());
permissions
.
addAll
(
getRolePermissions
(
this
,
PostgrePrivilege
.
Kind
.
FUNCTION
,
dbStat
));
}
Collections
.
sort
(
permissions
);
return
permissions
;
}
catch
(
SQLException
e
)
{
throw
new
DBException
(
e
,
getDataSource
());
}
}
private
static
Collection
<
PostgrePermission
>
getRolePermissions
(
PostgreRole
role
,
PostgrePrivilege
.
Kind
kind
,
JDBCPreparedStatement
dbStat
)
throws
SQLException
{
try
(
JDBCResultSet
dbResult
=
dbStat
.
executeQuery
())
{
Map
<
String
,
List
<
PostgrePrivilege
>>
privs
=
new
LinkedHashMap
<>();
while
(
dbResult
.
next
())
{
PostgrePrivilege
privilege
=
new
PostgrePrivilege
(
kind
,
dbResult
);
String
tableId
=
privilege
.
getObjectSchema
()
+
"."
+
privilege
.
getObjectName
();
List
<
PostgrePrivilege
>
privList
=
privs
.
computeIfAbsent
(
tableId
,
k
->
new
ArrayList
<>());
privList
.
add
(
privilege
);
}
// Pack to permission list
List
<
PostgrePermission
>
result
=
new
ArrayList
<>(
privs
.
size
());
for
(
List
<
PostgrePrivilege
>
priv
:
privs
.
values
())
{
result
.
add
(
new
PostgreRolePermission
(
role
,
kind
,
priv
.
get
(
0
).
getObjectSchema
(),
priv
.
get
(
0
).
getObjectName
(),
priv
));
}
return
result
;
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录