Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
e1389b24
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,发现更多精彩内容 >>
提交
e1389b24
编写于
2月 12, 2019
作者:
S
serge-rider
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
#5233 SQL Server: error handle fix (for multi-results queries)
Former-commit-id:
955eedb6
上级
772c84fb
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
136 addition
and
19 deletion
+136
-19
plugins/org.jkiss.dbeaver.ext.mssql/src/org/jkiss/dbeaver/ext/mssql/model/SQLServerDataSourceInfo.java
...kiss/dbeaver/ext/mssql/model/SQLServerDataSourceInfo.java
+9
-0
plugins/org.jkiss.dbeaver.ext.wmi/src/org/jkiss/dbeaver/ext/wmi/model/WMIDataSourceInfo.java
...rc/org/jkiss/dbeaver/ext/wmi/model/WMIDataSourceInfo.java
+2
-15
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/DBPDataSourceInfo.java
....model/src/org/jkiss/dbeaver/model/DBPDataSourceInfo.java
+5
-0
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/BaseDataSourceInfo.java
.../src/org/jkiss/dbeaver/model/impl/BaseDataSourceInfo.java
+102
-0
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/jdbc/JDBCDataSourceInfo.java
...org/jkiss/dbeaver/model/impl/jdbc/JDBCDataSourceInfo.java
+5
-0
plugins/org.jkiss.dbeaver.ui.editors.sql/src/org/jkiss/dbeaver/ui/editors/sql/SQLEditorBase.java
...l/src/org/jkiss/dbeaver/ui/editors/sql/SQLEditorBase.java
+5
-0
plugins/org.jkiss.dbeaver.ui.editors.sql/src/org/jkiss/dbeaver/ui/editors/sql/execute/SQLQueryJob.java
...org/jkiss/dbeaver/ui/editors/sql/execute/SQLQueryJob.java
+8
-4
未找到文件。
plugins/org.jkiss.dbeaver.ext.mssql/src/org/jkiss/dbeaver/ext/mssql/model/SQLServerDataSourceInfo.java
浏览文件 @
e1389b24
...
@@ -16,6 +16,7 @@
...
@@ -16,6 +16,7 @@
*/
*/
package
org.jkiss.dbeaver.ext.mssql.model
;
package
org.jkiss.dbeaver.ext.mssql.model
;
import
org.jkiss.dbeaver.ext.mssql.SQLServerUtils
;
import
org.jkiss.dbeaver.model.exec.jdbc.JDBCDatabaseMetaData
;
import
org.jkiss.dbeaver.model.exec.jdbc.JDBCDatabaseMetaData
;
import
org.jkiss.dbeaver.model.impl.jdbc.JDBCDataSourceInfo
;
import
org.jkiss.dbeaver.model.impl.jdbc.JDBCDataSourceInfo
;
...
@@ -24,8 +25,11 @@ import org.jkiss.dbeaver.model.impl.jdbc.JDBCDataSourceInfo;
...
@@ -24,8 +25,11 @@ import org.jkiss.dbeaver.model.impl.jdbc.JDBCDataSourceInfo;
*/
*/
class
SQLServerDataSourceInfo
extends
JDBCDataSourceInfo
{
class
SQLServerDataSourceInfo
extends
JDBCDataSourceInfo
{
private
boolean
isSybase
;
public
SQLServerDataSourceInfo
(
SQLServerDataSource
dataSource
,
JDBCDatabaseMetaData
metaData
)
{
public
SQLServerDataSourceInfo
(
SQLServerDataSource
dataSource
,
JDBCDatabaseMetaData
metaData
)
{
super
(
metaData
);
super
(
metaData
);
this
.
isSybase
=
!
SQLServerUtils
.
isDriverSqlServer
(
dataSource
.
getContainer
().
getDriver
());
}
}
@Override
@Override
...
@@ -38,4 +42,9 @@ class SQLServerDataSourceInfo extends JDBCDataSourceInfo {
...
@@ -38,4 +42,9 @@ class SQLServerDataSourceInfo extends JDBCDataSourceInfo {
return
true
;
return
true
;
}
}
@Override
public
boolean
isMultipleResultsFetchBroken
()
{
return
isSybase
;
}
}
}
plugins/org.jkiss.dbeaver.ext.wmi/src/org/jkiss/dbeaver/ext/wmi/model/WMIDataSourceInfo.java
浏览文件 @
e1389b24
...
@@ -18,6 +18,7 @@ package org.jkiss.dbeaver.ext.wmi.model;
...
@@ -18,6 +18,7 @@ package org.jkiss.dbeaver.ext.wmi.model;
import
org.jkiss.dbeaver.model.DBPDataSourceInfo
;
import
org.jkiss.dbeaver.model.DBPDataSourceInfo
;
import
org.jkiss.dbeaver.model.DBPTransactionIsolation
;
import
org.jkiss.dbeaver.model.DBPTransactionIsolation
;
import
org.jkiss.dbeaver.model.impl.BaseDataSourceInfo
;
import
org.osgi.framework.Version
;
import
org.osgi.framework.Version
;
import
java.util.Collection
;
import
java.util.Collection
;
...
@@ -25,7 +26,7 @@ import java.util.Collection;
...
@@ -25,7 +26,7 @@ import java.util.Collection;
/**
/**
* Info
* Info
*/
*/
public
class
WMIDataSourceInfo
implements
DBP
DataSourceInfo
{
public
class
WMIDataSourceInfo
extends
Base
DataSourceInfo
{
public
WMIDataSourceInfo
()
public
WMIDataSourceInfo
()
{
{
...
@@ -136,18 +137,4 @@ public class WMIDataSourceInfo implements DBPDataSourceInfo {
...
@@ -136,18 +137,4 @@ public class WMIDataSourceInfo implements DBPDataSourceInfo {
return
true
;
return
true
;
}
}
@Override
public
boolean
supportsResultSetScroll
()
{
return
false
;
}
@Override
public
boolean
isDynamicMetadata
()
{
return
false
;
}
@Override
public
boolean
supportsMultipleResults
()
{
return
false
;
}
}
}
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/DBPDataSourceInfo.java
浏览文件 @
e1389b24
...
@@ -152,4 +152,9 @@ public interface DBPDataSourceInfo
...
@@ -152,4 +152,9 @@ public interface DBPDataSourceInfo
* Checks whether this data source supports multiple results for a single statement
* Checks whether this data source supports multiple results for a single statement
*/
*/
boolean
supportsMultipleResults
();
boolean
supportsMultipleResults
();
/**
* Workaround for broken drivers (#2792)
*/
boolean
isMultipleResultsFetchBroken
();
}
}
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/BaseDataSourceInfo.java
0 → 100644
浏览文件 @
e1389b24
/*
* DBeaver - Universal Database Manager
* Copyright (C) 2010-2019 Serge Rider (serge@jkiss.org)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org.jkiss.dbeaver.model.impl
;
import
org.jkiss.dbeaver.model.DBPDataSourceInfo
;
import
org.jkiss.dbeaver.model.DBPTransactionIsolation
;
import
java.util.Collection
;
/**
* BaseDataSourceInfo
*/
public
abstract
class
BaseDataSourceInfo
implements
DBPDataSourceInfo
{
@Override
public
boolean
supportsTransactions
()
{
return
false
;
}
@Override
public
boolean
supportsSavepoints
()
{
return
false
;
}
@Override
public
boolean
supportsReferentialIntegrity
()
{
return
false
;
}
@Override
public
boolean
supportsIndexes
()
{
return
false
;
}
@Override
public
boolean
supportsStoredCode
()
{
return
false
;
}
@Override
public
Collection
<
DBPTransactionIsolation
>
getSupportedTransactionsIsolation
()
{
return
null
;
}
@Override
public
boolean
supportsResultSetLimit
()
{
return
false
;
}
@Override
public
boolean
supportsResultSetScroll
()
{
return
false
;
}
@Override
public
boolean
isDynamicMetadata
()
{
return
false
;
}
@Override
public
boolean
supportsMultipleResults
()
{
return
false
;
}
@Override
public
boolean
isReadOnlyData
()
{
return
false
;
}
@Override
public
boolean
isReadOnlyMetaData
()
{
return
false
;
}
@Override
public
boolean
isMultipleResultsFetchBroken
()
{
return
false
;
}
@Override
public
boolean
supportsBatchUpdates
()
{
return
false
;
}
}
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/jdbc/JDBCDataSourceInfo.java
浏览文件 @
e1389b24
...
@@ -320,6 +320,11 @@ public class JDBCDataSourceInfo implements DBPDataSourceInfo
...
@@ -320,6 +320,11 @@ public class JDBCDataSourceInfo implements DBPDataSourceInfo
return
false
;
return
false
;
}
}
@Override
public
boolean
isMultipleResultsFetchBroken
()
{
return
false
;
}
public
void
setSupportsResultSetScroll
(
boolean
supportsScroll
)
public
void
setSupportsResultSetScroll
(
boolean
supportsScroll
)
{
{
this
.
supportsScroll
=
supportsScroll
;
this
.
supportsScroll
=
supportsScroll
;
...
...
plugins/org.jkiss.dbeaver.ui.editors.sql/src/org/jkiss/dbeaver/ui/editors/sql/SQLEditorBase.java
浏览文件 @
e1389b24
...
@@ -1330,6 +1330,11 @@ public abstract class SQLEditorBase extends BaseTextEditor implements DBPContext
...
@@ -1330,6 +1330,11 @@ public abstract class SQLEditorBase extends BaseTextEditor implements DBPContext
}
}
if
(
errorOffset
<
queryStartOffset
)
errorOffset
=
queryStartOffset
;
if
(
errorOffset
<
queryStartOffset
)
errorOffset
=
queryStartOffset
;
if
(
errorLength
>
queryLength
)
errorLength
=
queryLength
;
if
(
errorLength
>
queryLength
)
errorLength
=
queryLength
;
if
(
errorOffset
>=
queryStartOffset
+
queryLength
)
{
// This may happen if error position was incorrectly detected.
// E.g. in SQL Server when actual error happened in some stored procedure.
errorOffset
=
queryStartOffset
+
queryLength
-
1
;
}
getSelectionProvider
().
setSelection
(
new
TextSelection
(
errorOffset
,
errorLength
));
getSelectionProvider
().
setSelection
(
new
TextSelection
(
errorOffset
,
errorLength
));
scrolled
=
true
;
scrolled
=
true
;
}
}
...
...
plugins/org.jkiss.dbeaver.ui.editors.sql/src/org/jkiss/dbeaver/ui/editors/sql/execute/SQLQueryJob.java
浏览文件 @
e1389b24
...
@@ -504,10 +504,14 @@ public class SQLQueryJob extends DataSourceJob
...
@@ -504,10 +504,14 @@ public class SQLQueryJob extends DataSourceJob
try
{
try
{
hasResultSet
=
dbcStatement
.
nextResults
();
hasResultSet
=
dbcStatement
.
nextResults
();
}
catch
(
DBCException
e
)
{
}
catch
(
DBCException
e
)
{
log
.
error
(
e
);
if
(
session
.
getDataSource
().
getInfo
().
isMultipleResultsFetchBroken
())
{
// #2792: Check this twice. Some drivers (e.g. Sybase jConnect)
log
.
error
(
e
);
// throw error on n'th result fetch - but it still can keep fetching next results
// #2792: Check this twice. Some drivers (e.g. Sybase jConnect)
hasResultSet
=
dbcStatement
.
nextResults
();
// throw error on n'th result fetch - but it still can keep fetching next results
hasResultSet
=
dbcStatement
.
nextResults
();
}
else
{
throw
e
;
}
}
}
updateCount
=
hasResultSet
?
-
1
:
0
;
updateCount
=
hasResultSet
?
-
1
:
0
;
}
else
{
}
else
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录