Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
60989c1f
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,发现更多精彩内容 >>
提交
60989c1f
编写于
11月 07, 2020
作者:
S
Serge Rider
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
#10055 Workaround for MySQL serverTimezone problem
Former-commit-id:
321158df
上级
515d27f4
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
26 addition
and
4 deletion
+26
-4
plugins/org.jkiss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/model/MySQLDataSource.java
...rc/org/jkiss/dbeaver/ext/mysql/model/MySQLDataSource.java
+26
-4
未找到文件。
plugins/org.jkiss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/model/MySQLDataSource.java
浏览文件 @
60989c1f
...
@@ -82,6 +82,8 @@ public class MySQLDataSource extends JDBCDataSource implements DBPObjectStatisti
...
@@ -82,6 +82,8 @@ public class MySQLDataSource extends JDBCDataSource implements DBPObjectStatisti
private
volatile
boolean
hasStatistics
;
private
volatile
boolean
hasStatistics
;
private
boolean
containsCheckConstraintTable
;
private
boolean
containsCheckConstraintTable
;
private
transient
boolean
inServerTimezoneHandle
;
public
MySQLDataSource
(
DBRProgressMonitor
monitor
,
DBPDataSourceContainer
container
)
public
MySQLDataSource
(
DBRProgressMonitor
monitor
,
DBPDataSourceContainer
container
)
throws
DBException
{
throws
DBException
{
super
(
monitor
,
container
,
new
MySQLDialect
());
super
(
monitor
,
container
,
new
MySQLDialect
());
...
@@ -123,9 +125,9 @@ public class MySQLDataSource extends JDBCDataSource implements DBPObjectStatisti
...
@@ -123,9 +125,9 @@ public class MySQLDataSource extends JDBCDataSource implements DBPObjectStatisti
}
}
String
serverTZ
=
connectionInfo
.
getProviderProperty
(
MySQLConstants
.
PROP_SERVER_TIMEZONE
);
String
serverTZ
=
connectionInfo
.
getProviderProperty
(
MySQLConstants
.
PROP_SERVER_TIMEZONE
);
// if (CommonUtils.isEmpty(serverTZ) && getContainer().getDriver().getId().equals(MySQLConstants.DRIVER_ID_MYSQL8)
) {
if
(
CommonUtils
.
isEmpty
(
serverTZ
)
&&
inServerTimezoneHandle
/*&& getContainer().getDriver().getId().equals(MySQLConstants.DRIVER_ID_MYSQL8)*/
)
{
//
serverTZ = "UTC";
serverTZ
=
"UTC"
;
//
}
}
if
(!
CommonUtils
.
isEmpty
(
serverTZ
))
{
if
(!
CommonUtils
.
isEmpty
(
serverTZ
))
{
props
.
put
(
"serverTimezone"
,
serverTZ
);
props
.
put
(
"serverTimezone"
,
serverTZ
);
}
}
...
@@ -400,7 +402,27 @@ public class MySQLDataSource extends JDBCDataSource implements DBPObjectStatisti
...
@@ -400,7 +402,27 @@ public class MySQLDataSource extends JDBCDataSource implements DBPObjectStatisti
@Override
@Override
protected
Connection
openConnection
(
@NotNull
DBRProgressMonitor
monitor
,
@Nullable
JDBCExecutionContext
context
,
@NotNull
String
purpose
)
throws
DBCException
{
protected
Connection
openConnection
(
@NotNull
DBRProgressMonitor
monitor
,
@Nullable
JDBCExecutionContext
context
,
@NotNull
String
purpose
)
throws
DBCException
{
Connection
mysqlConnection
=
super
.
openConnection
(
monitor
,
context
,
purpose
);
Connection
mysqlConnection
;
try
{
mysqlConnection
=
super
.
openConnection
(
monitor
,
context
,
purpose
);
}
catch
(
DBCException
e
)
{
if
(
e
.
getCause
()
instanceof
SQLException
&&
SQLState
.
SQL_01S00
.
getCode
().
equals
(((
SQLException
)
e
.
getCause
()).
getSQLState
())
&&
CommonUtils
.
isEmpty
(
getContainer
().
getActualConnectionConfiguration
().
getProviderProperty
(
MySQLConstants
.
PROP_SERVER_TIMEZONE
)))
{
// Workaround for nasty problem with MySQL 8 driver and serverTimezone error
log
.
debug
(
"Error connecting without serverTimezone. Trying to set serverTimezone=UTC. Original error: "
+
e
.
getMessage
());
inServerTimezoneHandle
=
true
;
try
{
mysqlConnection
=
super
.
openConnection
(
monitor
,
context
,
purpose
);
}
catch
(
DBCException
e2
)
{
inServerTimezoneHandle
=
false
;
throw
e2
;
}
}
else
{
throw
e
;
}
}
if
(!
getContainer
().
getPreferenceStore
().
getBoolean
(
ModelPreferences
.
META_CLIENT_NAME_DISABLE
))
{
if
(!
getContainer
().
getPreferenceStore
().
getBoolean
(
ModelPreferences
.
META_CLIENT_NAME_DISABLE
))
{
// Provide client info
// Provide client info
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录