Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
一剑流云
dbeaver
提交
ce174566
D
dbeaver
项目概览
一剑流云
/
dbeaver
与 Fork 源项目一致
从无法访问的项目Fork
通知
7
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,发现更多精彩内容 >>
提交
ce174566
编写于
6月 08, 2018
作者:
S
serge-rider
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
#3589 PG: owner permissions parse fix
上级
4dc91ac1
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
28 addition
and
5 deletion
+28
-5
plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/PostgreUtils.java
...ql/src/org/jkiss/dbeaver/ext/postgresql/PostgreUtils.java
+24
-1
plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgrePrivilegeType.java
...ss/dbeaver/ext/postgresql/model/PostgrePrivilegeType.java
+1
-1
plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreProcedure.java
.../jkiss/dbeaver/ext/postgresql/model/PostgreProcedure.java
+1
-1
plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreTableBase.java
.../jkiss/dbeaver/ext/postgresql/model/PostgreTableBase.java
+1
-1
plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreTableColumn.java
...kiss/dbeaver/ext/postgresql/model/PostgreTableColumn.java
+1
-1
未找到文件。
plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/PostgreUtils.java
浏览文件 @
ce174566
...
@@ -455,8 +455,31 @@ public class PostgreUtils {
...
@@ -455,8 +455,31 @@ public class PostgreUtils {
driver
.
getDriverParameter
(
PostgreConstants
.
PROP_GREENPLUM_DRIVER
));
driver
.
getDriverParameter
(
PostgreConstants
.
PROP_GREENPLUM_DRIVER
));
}
}
public
static
List
<
PostgrePermission
>
extractPermissionsFromACL
(
@NotNull
PostgrePermissionsOwner
owner
,
@Nullable
Object
acl
)
{
public
static
List
<
PostgrePermission
>
extractPermissionsFromACL
(
DBRProgressMonitor
monitor
,
@NotNull
PostgrePermissionsOwner
owner
,
@Nullable
Object
acl
)
throws
DBException
{
if
(!(
acl
instanceof
java
.
sql
.
Array
))
{
if
(!(
acl
instanceof
java
.
sql
.
Array
))
{
if
(
acl
==
null
)
{
// Special case. Means ALL permissions are granted to table owner
PostgreRole
objectOwner
=
owner
.
getOwner
(
monitor
);
String
granteeName
=
objectOwner
==
null
?
null
:
objectOwner
.
getName
();
List
<
PostgrePrivilege
>
privileges
=
new
ArrayList
<>();
for
(
PostgrePrivilegeType
pt
:
PostgrePrivilegeType
.
values
())
{
if
(
pt
.
supportsType
(
owner
.
getClass
()))
{
privileges
.
add
(
new
PostgrePrivilege
(
granteeName
,
granteeName
,
owner
.
getDatabase
().
getName
(),
owner
.
getSchema
().
getName
(),
owner
.
getName
(),
pt
,
false
,
false
));
}
}
PostgreObjectPermission
permission
=
new
PostgreObjectPermission
(
owner
,
objectOwner
==
null
?
null
:
objectOwner
.
getName
(),
privileges
);
return
Collections
.
singletonList
(
permission
);
}
return
Collections
.
emptyList
();
return
Collections
.
emptyList
();
}
}
Object
itemArray
;
Object
itemArray
;
...
...
plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgrePrivilegeType.java
浏览文件 @
ce174566
...
@@ -35,7 +35,7 @@ public enum PostgrePrivilegeType {
...
@@ -35,7 +35,7 @@ public enum PostgrePrivilegeType {
EXECUTE
(
'X'
,
true
,
PostgreProcedure
.
class
),
EXECUTE
(
'X'
,
true
,
PostgreProcedure
.
class
),
UNKNOWN
((
char
)
0
,
false
,
Object
.
class
);
UNKNOWN
((
char
)
0
,
false
);
private
final
Class
<?>[]
targetType
;
private
final
Class
<?>[]
targetType
;
private
final
char
code
;
private
final
char
code
;
...
...
plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreProcedure.java
浏览文件 @
ce174566
...
@@ -454,7 +454,7 @@ public class PostgreProcedure extends AbstractProcedure<PostgreDataSource, Postg
...
@@ -454,7 +454,7 @@ public class PostgreProcedure extends AbstractProcedure<PostgreDataSource, Postg
@Override
@Override
public
Collection
<
PostgrePermission
>
getPermissions
(
DBRProgressMonitor
monitor
,
boolean
includeNestedObjects
)
throws
DBException
{
public
Collection
<
PostgrePermission
>
getPermissions
(
DBRProgressMonitor
monitor
,
boolean
includeNestedObjects
)
throws
DBException
{
return
PostgreUtils
.
extractPermissionsFromACL
(
this
,
acl
);
return
PostgreUtils
.
extractPermissionsFromACL
(
monitor
,
this
,
acl
);
}
}
@Override
@Override
...
...
plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreTableBase.java
浏览文件 @
ce174566
...
@@ -193,7 +193,7 @@ public abstract class PostgreTableBase extends JDBCTable<PostgreDataSource, Post
...
@@ -193,7 +193,7 @@ public abstract class PostgreTableBase extends JDBCTable<PostgreDataSource, Post
@Override
@Override
public
Collection
<
PostgrePermission
>
getPermissions
(
DBRProgressMonitor
monitor
,
boolean
includeNestedObjects
)
throws
DBException
{
public
Collection
<
PostgrePermission
>
getPermissions
(
DBRProgressMonitor
monitor
,
boolean
includeNestedObjects
)
throws
DBException
{
List
<
PostgrePermission
>
tablePermissions
=
PostgreUtils
.
extractPermissionsFromACL
(
this
,
acl
);
List
<
PostgrePermission
>
tablePermissions
=
PostgreUtils
.
extractPermissionsFromACL
(
monitor
,
this
,
acl
);
if
(!
includeNestedObjects
)
{
if
(!
includeNestedObjects
)
{
return
tablePermissions
;
return
tablePermissions
;
}
}
...
...
plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreTableColumn.java
浏览文件 @
ce174566
...
@@ -48,7 +48,7 @@ public class PostgreTableColumn extends PostgreAttribute<PostgreTableBase> imple
...
@@ -48,7 +48,7 @@ public class PostgreTableColumn extends PostgreAttribute<PostgreTableBase> imple
@Override
@Override
public
Collection
<
PostgrePermission
>
getPermissions
(
DBRProgressMonitor
monitor
,
boolean
includeNestedObjects
)
throws
DBException
{
public
Collection
<
PostgrePermission
>
getPermissions
(
DBRProgressMonitor
monitor
,
boolean
includeNestedObjects
)
throws
DBException
{
return
PostgreUtils
.
extractPermissionsFromACL
(
this
,
getAcl
());
return
PostgreUtils
.
extractPermissionsFromACL
(
monitor
,
this
,
getAcl
());
}
}
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录