Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
4f980491
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,发现更多精彩内容 >>
未验证
提交
4f980491
编写于
10月 22, 2021
作者:
S
Serge Rider
提交者:
GitHub
10月 22, 2021
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #14337 from dbeaver/postgrePath#13750
#13750 set $user in the end of the search path
上级
06b33dc3
96e4b139
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
28 addition
and
5 deletion
+28
-5
plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/PostgreConstants.java
...rc/org/jkiss/dbeaver/ext/postgresql/PostgreConstants.java
+1
-0
plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/PostgreUtils.java
...ql/src/org/jkiss/dbeaver/ext/postgresql/PostgreUtils.java
+1
-1
plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreExecutionContext.java
...dbeaver/ext/postgresql/model/PostgreExecutionContext.java
+26
-4
未找到文件。
plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/PostgreConstants.java
浏览文件 @
4f980491
...
...
@@ -39,6 +39,7 @@ public class PostgreConstants {
public
static
final
String
DEFAULT_DATABASE
=
"postgres"
;
public
static
final
String
DEFAULT_DATA_TYPE
=
"varchar"
;
public
static
final
String
DEFAULT_USER
=
"postgres"
;
public
static
final
String
USER_VARIABLE
=
"$user"
;
public
static
final
String
PROP_CHOSEN_ROLE
=
DBConstants
.
INTERNAL_PROP_PREFIX
+
"chosen-role@"
;
public
static
final
String
PROP_SHOW_NON_DEFAULT_DB
=
DBConstants
.
INTERNAL_PROP_PREFIX
+
"show-non-default-db@"
;
...
...
plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/PostgreUtils.java
浏览文件 @
4f980491
...
...
@@ -665,7 +665,7 @@ public class PostgreUtils {
}
public
static
String
getRealSchemaName
(
PostgreDatabase
database
,
String
name
)
{
return
name
.
replace
(
"$user"
,
database
.
getMetaContext
().
getActiveUser
());
return
name
.
replace
(
PostgreConstants
.
USER_VARIABLE
,
database
.
getMetaContext
().
getActiveUser
());
}
}
plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreExecutionContext.java
浏览文件 @
4f980491
...
...
@@ -193,6 +193,7 @@ public class PostgreExecutionContext extends JDBCExecutionContext implements DBC
}
if
(
defaultSearchPath
.
isEmpty
())
{
setUserInTheEndOfThePath
(
searchPath
);
defaultSearchPath
=
new
ArrayList
<>(
searchPath
);
}
...
...
@@ -243,9 +244,8 @@ public class PostgreExecutionContext extends JDBCExecutionContext implements DBC
// Remove from previous position
newSearchPath
.
remove
(
schemaIndex
);
}
// Add it first (or after $user)
int
newIndex
=
isUserFirstInPath
(
newSearchPath
)
?
1
:
0
;
newSearchPath
.
add
(
newIndex
,
defSchemaName
);
// Add it first
newSearchPath
.
add
(
0
,
defSchemaName
);
}
StringBuilder
spString
=
new
StringBuilder
();
...
...
@@ -261,7 +261,29 @@ public class PostgreExecutionContext extends JDBCExecutionContext implements DBC
}
private
static
boolean
isUserFirstInPath
(
List
<
String
>
newSearchPath
)
{
return
!
newSearchPath
.
isEmpty
()
&&
newSearchPath
.
get
(
0
).
equals
(
"$user"
);
return
!
newSearchPath
.
isEmpty
()
&&
newSearchPath
.
get
(
0
).
equals
(
PostgreConstants
.
USER_VARIABLE
);
}
private
void
setUserInTheEndOfThePath
(
List
<
String
>
searchPath
)
{
if
(
CommonUtils
.
isEmpty
(
searchPath
))
{
return
;
}
if
(
isUserFirstInPath
(
searchPath
))
{
searchPath
.
remove
(
0
);
searchPath
.
add
(
PostgreConstants
.
USER_VARIABLE
);
}
else
{
int
userIndex
=
-
1
;
for
(
int
i
=
0
;
i
<
searchPath
.
size
();
i
++)
{
if
(
searchPath
.
get
(
i
).
equals
(
PostgreConstants
.
USER_VARIABLE
))
{
userIndex
=
i
;
break
;
}
}
if
(
userIndex
!=
-
1
)
{
searchPath
.
remove
(
userIndex
);
searchPath
.
add
(
PostgreConstants
.
USER_VARIABLE
);
}
}
}
private
void
setSearchPath
(
String
path
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录