Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
c40e7a97
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,发现更多精彩内容 >>
提交
c40e7a97
编写于
4月 13, 2018
作者:
S
serge-rider
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
#3244 PG: fix search path update on active schema change
Former-commit-id:
ce6f352c
上级
e4731220
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
33 addition
and
5 deletion
+33
-5
plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreDataSource.java
...jkiss/dbeaver/ext/postgresql/model/PostgreDataSource.java
+13
-0
plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreDatabase.java
...g/jkiss/dbeaver/ext/postgresql/model/PostgreDatabase.java
+20
-5
未找到文件。
plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreDataSource.java
浏览文件 @
c40e7a97
...
...
@@ -66,6 +66,7 @@ public class PostgreDataSource extends JDBCDataSource implements DBSObjectSelect
private
String
activeDatabaseName
;
private
String
activeSchemaName
;
private
final
List
<
String
>
searchPath
=
new
ArrayList
<>();
private
final
List
<
String
>
defaultSearchPath
=
new
ArrayList
<>();
private
String
activeUser
;
public
PostgreDataSource
(
DBRProgressMonitor
monitor
,
DBPDataSourceContainer
container
)
...
...
@@ -174,6 +175,8 @@ public class PostgreDataSource extends JDBCDataSource implements DBSObjectSelect
}
catch
(
Exception
e
)
{
log
.
debug
(
e
);
}
defaultSearchPath
.
clear
();
defaultSearchPath
.
addAll
(
searchPath
);
// Read databases
databaseCache
.
getAllObjects
(
monitor
,
this
);
...
...
@@ -286,6 +289,12 @@ public class PostgreDataSource extends JDBCDataSource implements DBSObjectSelect
conConfig
.
setUrl
(
getContainer
().
getDriver
().
getDataSourceProvider
().
getConnectionURL
(
getContainer
().
getDriver
(),
conConfig
));
getContainer
().
getRegistry
().
flushConfig
();
try
(
JDBCSession
session
=
getDefaultContext
(
false
).
openSession
(
monitor
,
DBCExecutionPurpose
.
UTIL
,
"Update object state"
))
{
determineDefaultObjects
(
session
);
}
catch
(
SQLException
e
)
{
throw
new
DBException
(
e
,
this
);
}
// Notify UI
if
(
oldDatabase
!=
null
)
{
DBUtils
.
fireObjectSelect
(
oldDatabase
,
false
);
...
...
@@ -334,6 +343,10 @@ public class PostgreDataSource extends JDBCDataSource implements DBSObjectSelect
return
searchPath
;
}
List
<
String
>
getDefaultSearchPath
()
{
return
defaultSearchPath
;
}
public
void
setSearchPath
(
String
path
)
{
searchPath
.
clear
();
searchPath
.
add
(
path
);
...
...
plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreDatabase.java
浏览文件 @
c40e7a97
...
...
@@ -48,12 +48,10 @@ import org.jkiss.utils.CommonUtils;
import
org.jkiss.utils.LongKeyMap
;
import
java.sql.SQLException
;
import
java.util.Collection
;
import
java.util.Collections
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.*
;
import
java.util.Map.Entry
;
import
java.util.concurrent.ConcurrentHashMap
;
import
java.util.stream.Collectors
;
/**
* PostgreDatabase
...
...
@@ -443,8 +441,25 @@ public class PostgreDatabase implements DBSInstance, DBSCatalog, DBPRefreshableO
}
void
setSearchPath
(
DBRProgressMonitor
monitor
,
PostgreSchema
schema
,
JDBCExecutionContext
context
)
throws
DBCException
{
// Construct search path from current search path but put default schema first
List
<
String
>
newSearchPath
=
new
ArrayList
<>(
dataSource
.
getDefaultSearchPath
());
{
String
defSchemaName
=
DBUtils
.
getQuotedIdentifier
(
schema
);
int
schemaIndex
=
newSearchPath
.
indexOf
(
defSchemaName
);
if
(
schemaIndex
==
0
)
{
// Already default schema
}
else
{
if
(
schemaIndex
>
0
)
{
// Remove from previous position
newSearchPath
.
remove
(
schemaIndex
);
}
// Add it first
newSearchPath
.
add
(
0
,
defSchemaName
);
}
}
try
(
JDBCSession
session
=
context
.
openSession
(
monitor
,
DBCExecutionPurpose
.
UTIL
,
"Change search path"
))
{
JDBCUtils
.
executeSQL
(
session
,
"SET search_path = \"$user\","
+
DBUtils
.
getQuotedIdentifier
(
schema
));
String
sp
=
newSearchPath
.
stream
().
collect
(
Collectors
.
joining
(
","
));
JDBCUtils
.
executeSQL
(
session
,
"SET search_path = "
+
sp
);
}
catch
(
SQLException
e
)
{
throw
new
DBCException
(
"Error setting search path"
,
e
,
dataSource
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录