Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
a4f8f2f7
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,发现更多精彩内容 >>
提交
a4f8f2f7
编写于
4月 11, 2020
作者:
S
serge-rider
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
#8416 Transaction check fixed
上级
f4032f5a
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
17 addition
and
6 deletion
+17
-6
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/txn/PendingTransactionsDialog.java
...ss/dbeaver/ui/controls/txn/PendingTransactionsDialog.java
+2
-2
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/qm/QMUtils.java
...dbeaver.model/src/org/jkiss/dbeaver/model/qm/QMUtils.java
+15
-4
未找到文件。
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/txn/PendingTransactionsDialog.java
浏览文件 @
a4f8f2f7
...
@@ -90,7 +90,7 @@ public class PendingTransactionsDialog extends TransactionInfoDialog {
...
@@ -90,7 +90,7 @@ public class PendingTransactionsDialog extends TransactionInfoDialog {
}
else
{
}
else
{
selectedContext
=
null
;
selectedContext
=
null
;
}
}
boolean
hasTransaction
=
selectedContext
!=
null
&&
QMUtils
.
isTransactionActive
(
selectedContext
);
boolean
hasTransaction
=
selectedContext
!=
null
&&
QMUtils
.
isTransactionActive
(
selectedContext
,
false
);
commitButton
.
setEnabled
(
hasTransaction
);
commitButton
.
setEnabled
(
hasTransaction
);
rollbackButton
.
setEnabled
(
hasTransaction
);
rollbackButton
.
setEnabled
(
hasTransaction
);
logViewer
.
setFilter
(
createContextFilter
(
selectedContext
));
logViewer
.
setFilter
(
createContextFilter
(
selectedContext
));
...
@@ -168,7 +168,7 @@ public class PendingTransactionsDialog extends TransactionInfoDialog {
...
@@ -168,7 +168,7 @@ public class PendingTransactionsDialog extends TransactionInfoDialog {
}
}
List
<
DBCExecutionContext
>
txnContexts
=
new
ArrayList
<>();
List
<
DBCExecutionContext
>
txnContexts
=
new
ArrayList
<>();
for
(
DBCExecutionContext
context
:
allContexts
)
{
for
(
DBCExecutionContext
context
:
allContexts
)
{
if
(
showAllContexts
||
QMUtils
.
isTransactionActive
(
context
))
{
if
(
showAllContexts
||
QMUtils
.
isTransactionActive
(
context
,
false
))
{
txnContexts
.
add
(
context
);
txnContexts
.
add
(
context
);
}
}
}
}
...
...
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/qm/QMUtils.java
浏览文件 @
a4f8f2f7
...
@@ -79,6 +79,10 @@ public class QMUtils {
...
@@ -79,6 +79,10 @@ public class QMUtils {
}
}
public
static
boolean
isTransactionActive
(
DBCExecutionContext
executionContext
)
{
public
static
boolean
isTransactionActive
(
DBCExecutionContext
executionContext
)
{
return
isTransactionActive
(
executionContext
,
true
);
}
public
static
boolean
isTransactionActive
(
DBCExecutionContext
executionContext
,
boolean
checkQueries
)
{
if
(
executionContext
==
null
||
application
==
null
)
{
if
(
executionContext
==
null
||
application
==
null
)
{
return
false
;
return
false
;
}
else
{
}
else
{
...
@@ -87,10 +91,17 @@ public class QMUtils {
...
@@ -87,10 +91,17 @@ public class QMUtils {
QMMTransactionInfo
txnInfo
=
sessionInfo
.
getTransaction
();
QMMTransactionInfo
txnInfo
=
sessionInfo
.
getTransaction
();
if
(
txnInfo
!=
null
)
{
if
(
txnInfo
!=
null
)
{
QMMTransactionSavepointInfo
sp
=
txnInfo
.
getCurrentSavepoint
();
QMMTransactionSavepointInfo
sp
=
txnInfo
.
getCurrentSavepoint
();
QMMStatementExecuteInfo
execInfo
=
sp
.
getLastExecute
();
if
(
sp
!=
null
)
{
if
(
execInfo
!=
null
)
{
if
(
checkQueries
)
{
// If transaction was enabled all statements are transactional
// If transaction was enabled all statements are transactional
return
true
;
for
(
QMMStatementExecuteInfo
ei
=
sp
.
getLastExecute
();
ei
!=
null
;
ei
=
ei
.
getPrevious
())
{
if
(
ei
.
isTransactional
())
{
return
true
;
}
}
}
else
{
return
sp
.
getLastExecute
()
!=
null
;
}
}
}
// for (QMMStatementExecuteInfo exec = execInfo; exec != null && exec.getSavepoint() == sp; exec = exec.getPrevious()) {
// for (QMMStatementExecuteInfo exec = execInfo; exec != null && exec.getSavepoint() == sp; exec = exec.getPrevious()) {
// if (exec.isTransactional()) {
// if (exec.isTransactional()) {
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录