Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
见谅
dbeaver
提交
f38ba34c
D
dbeaver
项目概览
见谅
/
dbeaver
与 Fork 源项目一致
从无法访问的项目Fork
通知
6
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,发现更多精彩内容 >>
提交
f38ba34c
编写于
10月 13, 2014
作者:
J
jurgen
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Minor fixes (NPE)
上级
4c1f460a
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
16 addition
and
14 deletion
+16
-14
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DataSourceDescriptor.java
.../src/org/jkiss/dbeaver/registry/DataSourceDescriptor.java
+12
-13
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/jobs/DataSourceJob.java
...ore/src/org/jkiss/dbeaver/runtime/jobs/DataSourceJob.java
+1
-0
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/sql/SQLQueryJob.java
...r.core/src/org/jkiss/dbeaver/runtime/sql/SQLQueryJob.java
+3
-1
未找到文件。
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DataSourceDescriptor.java
浏览文件 @
f38ba34c
...
...
@@ -293,8 +293,8 @@ public class DataSourceDescriptor
@Override
public
boolean
isDefaultAutoCommit
()
{
if
(
getPreferenceStore
()
.
contains
(
DBeaverPreferences
.
DEFAULT_AUTO_COMMIT
))
{
return
getPreferenceStore
()
.
getBoolean
(
DBeaverPreferences
.
DEFAULT_AUTO_COMMIT
);
if
(
preferenceStore
.
contains
(
DBeaverPreferences
.
DEFAULT_AUTO_COMMIT
))
{
return
preferenceStore
.
getBoolean
(
DBeaverPreferences
.
DEFAULT_AUTO_COMMIT
);
}
else
{
return
getConnectionInfo
().
getConnectionType
().
isAutocommit
();
}
...
...
@@ -329,9 +329,9 @@ public class DataSourceDescriptor
}
// Save in preferences
if
(
autoCommit
==
getConnectionInfo
().
getConnectionType
().
isAutocommit
())
{
getPreferenceStore
()
.
setToDefault
(
DBeaverPreferences
.
DEFAULT_AUTO_COMMIT
);
preferenceStore
.
setToDefault
(
DBeaverPreferences
.
DEFAULT_AUTO_COMMIT
);
}
else
{
getPreferenceStore
()
.
setValue
(
DBeaverPreferences
.
DEFAULT_AUTO_COMMIT
,
autoCommit
);
preferenceStore
.
setValue
(
DBeaverPreferences
.
DEFAULT_AUTO_COMMIT
,
autoCommit
);
}
}
...
...
@@ -380,7 +380,7 @@ public class DataSourceDescriptor
{
try
{
if
(
isolationLevel
==
null
)
{
getPreferenceStore
()
.
setToDefault
(
DBeaverPreferences
.
DEFAULT_ISOLATION
);
preferenceStore
.
setToDefault
(
DBeaverPreferences
.
DEFAULT_ISOLATION
);
}
else
{
DBeaverUI
.
runInProgressService
(
new
DBRRunnableWithProgress
()
{
@Override
...
...
@@ -391,7 +391,7 @@ public class DataSourceDescriptor
try
{
if
(!
txnManager
.
getTransactionIsolation
().
equals
(
isolationLevel
))
{
txnManager
.
setTransactionIsolation
(
isolationLevel
);
getPreferenceStore
()
.
setValue
(
DBeaverPreferences
.
DEFAULT_ISOLATION
,
isolationLevel
.
getCode
());
preferenceStore
.
setValue
(
DBeaverPreferences
.
DEFAULT_ISOLATION
,
isolationLevel
.
getCode
());
}
}
catch
(
DBCException
e
)
{
throw
new
InvocationTargetException
(
e
);
...
...
@@ -413,11 +413,11 @@ public class DataSourceDescriptor
}
public
String
getDefaultActiveObject
()
{
return
getPreferenceStore
()
.
getString
(
DBeaverPreferences
.
DEFAULT_ACTIVE_OBJECT
);
return
preferenceStore
.
getString
(
DBeaverPreferences
.
DEFAULT_ACTIVE_OBJECT
);
}
public
void
setDefaultActiveObject
(
String
defaultActiveObject
)
{
getPreferenceStore
()
.
setValue
(
DBeaverPreferences
.
DEFAULT_ACTIVE_OBJECT
,
defaultActiveObject
);
preferenceStore
.
setValue
(
DBeaverPreferences
.
DEFAULT_ACTIVE_OBJECT
,
defaultActiveObject
);
}
public
Collection
<
FilterMapping
>
getObjectFilters
()
...
...
@@ -648,20 +648,19 @@ public class DataSourceDescriptor
DBCTransactionManager
txnManager
=
session
.
getTransactionManager
();
// Set auto-commit
boolean
autoCommit
=
txnManager
.
isAutoCommit
();
AbstractPreferenceStore
store
=
getPreferenceStore
();
boolean
newAutoCommit
;
if
(!
s
tore
.
contains
(
DBeaverPreferences
.
DEFAULT_AUTO_COMMIT
))
{
if
(!
preferenceS
tore
.
contains
(
DBeaverPreferences
.
DEFAULT_AUTO_COMMIT
))
{
newAutoCommit
=
connectionInfo
.
getConnectionType
().
isAutocommit
();
}
else
{
newAutoCommit
=
s
tore
.
getBoolean
(
DBeaverPreferences
.
DEFAULT_AUTO_COMMIT
);
newAutoCommit
=
preferenceS
tore
.
getBoolean
(
DBeaverPreferences
.
DEFAULT_AUTO_COMMIT
);
}
if
(
autoCommit
!=
newAutoCommit
)
{
// Change auto-commit state
txnManager
.
setAutoCommit
(
newAutoCommit
);
}
// Set txn isolation level
if
(
s
tore
.
contains
(
DBeaverPreferences
.
DEFAULT_ISOLATION
))
{
int
isolationCode
=
s
tore
.
getInt
(
DBeaverPreferences
.
DEFAULT_ISOLATION
);
if
(
preferenceS
tore
.
contains
(
DBeaverPreferences
.
DEFAULT_ISOLATION
))
{
int
isolationCode
=
preferenceS
tore
.
getInt
(
DBeaverPreferences
.
DEFAULT_ISOLATION
);
Collection
<
DBPTransactionIsolation
>
supportedLevels
=
dataSource
.
getInfo
().
getSupportedTransactionsIsolation
();
if
(!
CommonUtils
.
isEmpty
(
supportedLevels
))
{
for
(
DBPTransactionIsolation
level
:
supportedLevels
)
{
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/jobs/DataSourceJob.java
浏览文件 @
f38ba34c
...
...
@@ -67,6 +67,7 @@ public abstract class DataSourceJob extends AbstractJob implements DBPDataSource
});
}
@Nullable
public
DBPDataSource
getDataSource
()
{
return
dataSourceContainer
.
getDataSource
();
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/sql/SQLQueryJob.java
浏览文件 @
f38ba34c
...
...
@@ -579,8 +579,10 @@ public class SQLQueryJob extends DataSourceJob
private
boolean
keepStatementOpen
()
{
// Only in single query mode and if pref option set to true
DBPDataSource
dataSource
=
getDataSource
();
return
queries
.
size
()
==
1
&&
getDataSource
().
getContainer
().
getPreferenceStore
().
getBoolean
(
DBeaverPreferences
.
KEEP_STATEMENT_OPEN
);
dataSource
!=
null
&&
dataSource
.
getContainer
().
getPreferenceStore
().
getBoolean
(
DBeaverPreferences
.
KEEP_STATEMENT_OPEN
);
}
private
void
closeStatement
()
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录