Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
49b20439
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,发现更多精彩内容 >>
提交
49b20439
编写于
3月 08, 2016
作者:
S
Serge Rider
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Postgre database info read
上级
f236d7ab
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
23 addition
and
12 deletion
+23
-12
plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreDataSource.java
...jkiss/dbeaver/ext/postgresql/model/PostgreDataSource.java
+21
-5
plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreDatabase.java
...g/jkiss/dbeaver/ext/postgresql/model/PostgreDatabase.java
+2
-7
未找到文件。
plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreDataSource.java
浏览文件 @
49b20439
...
...
@@ -65,6 +65,7 @@ public class PostgreDataSource extends JDBCDataSource implements DBSObjectSelect
private
final
DatabaseCache
databaseCache
=
new
DatabaseCache
();
private
String
activeDatabaseName
;
private
String
activeSchemaName
;
private
final
List
<
String
>
searchPath
=
new
ArrayList
<>();
private
String
activeUser
;
...
...
@@ -153,7 +154,14 @@ public class PostgreDataSource extends JDBCDataSource implements DBSObjectSelect
activeDatabaseName
=
getContainer
().
getConnectionConfiguration
().
getDatabaseName
();
try
(
JDBCSession
session
=
DBUtils
.
openMetaSession
(
monitor
,
this
,
"Load meta info"
))
{
activeUser
=
JDBCUtils
.
queryString
(
session
,
"SELECT SESSION_USER"
);
try
(
JDBCPreparedStatement
stat
=
session
.
prepareStatement
(
"SELECT current_database(), current_schema(),session_user"
))
{
try
(
JDBCResultSet
rs
=
stat
.
executeQuery
())
{
rs
.
nextRow
();
activeDatabaseName
=
JDBCUtils
.
safeGetString
(
rs
,
1
);
activeSchemaName
=
JDBCUtils
.
safeGetString
(
rs
,
2
);
activeUser
=
JDBCUtils
.
safeGetString
(
rs
,
3
);
}
}
String
searchPathStr
=
JDBCUtils
.
queryString
(
session
,
"SHOW search_path"
);
if
(
searchPathStr
!=
null
)
{
Collections
.
addAll
(
this
.
searchPath
,
searchPathStr
.
replace
(
"$user"
,
activeUser
).
split
(
","
));
...
...
@@ -263,6 +271,14 @@ public class PostgreDataSource extends JDBCDataSource implements DBSObjectSelect
return
activeUser
;
}
public
String
getActiveSchemaName
()
{
return
activeSchemaName
;
}
public
void
setActiveSchemaName
(
String
activeSchemaName
)
{
this
.
activeSchemaName
=
activeSchemaName
;
}
public
List
<
String
>
getSearchPath
()
{
return
searchPath
;
}
...
...
@@ -276,12 +292,12 @@ public class PostgreDataSource extends JDBCDataSource implements DBSObjectSelect
}
private
void
useDatabase
(
DBRProgressMonitor
monitor
,
JDBCExecutionContext
context
,
PostgreDatabase
catalog
)
throws
DBCException
{
throw
new
DBCException
(
"Active database change not supported yet"
);
//context.reconnect(
);
}
@Override
protected
Connection
openConnection
(
@NotNull
DBRProgressMonitor
monitor
,
@NotNull
String
purpose
)
throws
DBCException
{
Connection
mysql
Connection
=
super
.
openConnection
(
monitor
,
purpose
);
Connection
pg
Connection
=
super
.
openConnection
(
monitor
,
purpose
);
{
// Provide client info
...
...
@@ -289,7 +305,7 @@ public class PostgreDataSource extends JDBCDataSource implements DBSObjectSelect
if
(
product
!=
null
)
{
String
appName
=
DBeaverCore
.
getProductTitle
();
try
{
mysql
Connection
.
setClientInfo
(
"ApplicationName"
,
appName
+
" - "
+
purpose
);
pg
Connection
.
setClientInfo
(
"ApplicationName"
,
appName
+
" - "
+
purpose
);
}
catch
(
Throwable
e
)
{
// just ignore
log
.
debug
(
e
);
...
...
@@ -297,7 +313,7 @@ public class PostgreDataSource extends JDBCDataSource implements DBSObjectSelect
}
}
return
mysql
Connection
;
return
pg
Connection
;
}
@Override
...
...
plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreDatabase.java
浏览文件 @
49b20439
...
...
@@ -354,13 +354,7 @@ public class PostgreDatabase implements DBSInstance, DBSCatalog, DBPRefreshableO
@Nullable
@Override
public
PostgreSchema
getSelectedObject
()
{
for
(
String
schemaName
:
dataSource
.
getSearchPath
())
{
final
PostgreSchema
schema
=
schemaCache
.
getCachedObject
(
schemaName
);
if
(
schema
!=
null
)
{
return
schema
;
}
}
return
null
;
return
schemaCache
.
getCachedObject
(
dataSource
.
getActiveSchemaName
());
}
@Override
...
...
@@ -378,6 +372,7 @@ public class PostgreDatabase implements DBSInstance, DBSCatalog, DBPRefreshableO
throw
new
DBCException
(
"Error setting search path"
,
e
,
dataSource
);
}
}
dataSource
.
setActiveSchemaName
(
object
.
getName
());
dataSource
.
setSearchPath
(
object
.
getName
());
if
(
oldActive
!=
null
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录