Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
ac995eb8
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,发现更多精彩内容 >>
提交
ac995eb8
编写于
8月 09, 2018
作者:
S
Serge Rider
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
#3512 Oracle: disable escape processing for non-callable statements
上级
455b3c11
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
33 addition
and
4 deletion
+33
-4
plugins/org.jkiss.dbeaver.ext.oracle/src/org/jkiss/dbeaver/ext/oracle/model/OracleDataSource.java
.../org/jkiss/dbeaver/ext/oracle/model/OracleDataSource.java
+11
-0
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/jdbc/exec/JDBCConnectionImpl.java
...kiss/dbeaver/model/impl/jdbc/exec/JDBCConnectionImpl.java
+22
-4
未找到文件。
plugins/org.jkiss.dbeaver.ext.oracle/src/org/jkiss/dbeaver/ext/oracle/model/OracleDataSource.java
浏览文件 @
ac995eb8
...
@@ -669,6 +669,7 @@ public class OracleDataSource extends JDBCDataSource
...
@@ -669,6 +669,7 @@ public class OracleDataSource extends JDBCDataSource
private
Pattern
ERROR_POSITION_PATTERN
=
Pattern
.
compile
(
".+\\s+line ([0-9]+), column ([0-9]+)"
);
private
Pattern
ERROR_POSITION_PATTERN
=
Pattern
.
compile
(
".+\\s+line ([0-9]+), column ([0-9]+)"
);
private
Pattern
ERROR_POSITION_PATTERN_2
=
Pattern
.
compile
(
".+\\s+at line ([0-9]+)"
);
private
Pattern
ERROR_POSITION_PATTERN_2
=
Pattern
.
compile
(
".+\\s+at line ([0-9]+)"
);
private
Pattern
ERROR_POSITION_PATTERN_3
=
Pattern
.
compile
(
".+\\s+at position\\: ([0-9]+)"
);
@Nullable
@Nullable
@Override
@Override
...
@@ -699,6 +700,16 @@ public class OracleDataSource extends JDBCDataSource
...
@@ -699,6 +700,16 @@ public class OracleDataSource extends JDBCDataSource
positions
.
add
(
pos
);
positions
.
add
(
pos
);
}
}
}
}
if
(
positions
.
isEmpty
())
{
matcher
=
ERROR_POSITION_PATTERN_3
.
matcher
(
message
);
while
(
matcher
.
find
())
{
DBPErrorAssistant
.
ErrorPosition
pos
=
new
DBPErrorAssistant
.
ErrorPosition
();
pos
.
info
=
matcher
.
group
(
1
);
pos
.
position
=
Integer
.
parseInt
(
matcher
.
group
(
1
))
-
1
;
positions
.
add
(
pos
);
}
}
if
(!
positions
.
isEmpty
())
{
if
(!
positions
.
isEmpty
())
{
return
positions
.
toArray
(
new
ErrorPosition
[
positions
.
size
()]);
return
positions
.
toArray
(
new
ErrorPosition
[
positions
.
size
()]);
}
}
...
...
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/jdbc/exec/JDBCConnectionImpl.java
浏览文件 @
ac995eb8
...
@@ -23,7 +23,10 @@ import org.jkiss.dbeaver.Log;
...
@@ -23,7 +23,10 @@ import org.jkiss.dbeaver.Log;
import
org.jkiss.dbeaver.model.DBPErrorAssistant
;
import
org.jkiss.dbeaver.model.DBPErrorAssistant
;
import
org.jkiss.dbeaver.model.DBUtils
;
import
org.jkiss.dbeaver.model.DBUtils
;
import
org.jkiss.dbeaver.model.data.DBDValueHandler
;
import
org.jkiss.dbeaver.model.data.DBDValueHandler
;
import
org.jkiss.dbeaver.model.exec.*
;
import
org.jkiss.dbeaver.model.exec.DBCException
;
import
org.jkiss.dbeaver.model.exec.DBCExecutionPurpose
;
import
org.jkiss.dbeaver.model.exec.DBCSavepoint
;
import
org.jkiss.dbeaver.model.exec.DBCStatementType
;
import
org.jkiss.dbeaver.model.exec.jdbc.*
;
import
org.jkiss.dbeaver.model.exec.jdbc.*
;
import
org.jkiss.dbeaver.model.impl.AbstractSession
;
import
org.jkiss.dbeaver.model.impl.AbstractSession
;
import
org.jkiss.dbeaver.model.impl.jdbc.JDBCDataSource
;
import
org.jkiss.dbeaver.model.impl.jdbc.JDBCDataSource
;
...
@@ -151,6 +154,7 @@ public class JDBCConnectionImpl extends AbstractSession implements JDBCSession,
...
@@ -151,6 +154,7 @@ public class JDBCConnectionImpl extends AbstractSession implements JDBCSession,
if
(
statement
instanceof
JDBCStatementImpl
)
{
if
(
statement
instanceof
JDBCStatementImpl
)
{
statement
.
setQueryString
(
sqlQuery
);
statement
.
setQueryString
(
sqlQuery
);
}
}
disableStatementEscapeProcessing
(
statement
);
return
statement
;
return
statement
;
}
else
if
(
returnGeneratedKeys
)
{
}
else
if
(
returnGeneratedKeys
)
{
// Return keys
// Return keys
...
@@ -170,23 +174,26 @@ public class JDBCConnectionImpl extends AbstractSession implements JDBCSession,
...
@@ -170,23 +174,26 @@ public class JDBCConnectionImpl extends AbstractSession implements JDBCSession,
}
}
}
}
}
else
{
}
else
{
JDBCPreparedStatement
dbStat
;
try
{
try
{
// Generic prepared statement
// Generic prepared statement
return
prepareStatement
(
dbStat
=
prepareStatement
(
sqlQuery
,
sqlQuery
,
scrollable
?
ResultSet
.
TYPE_SCROLL_INSENSITIVE
:
ResultSet
.
TYPE_FORWARD_ONLY
,
scrollable
?
ResultSet
.
TYPE_SCROLL_INSENSITIVE
:
ResultSet
.
TYPE_FORWARD_ONLY
,
updatable
?
ResultSet
.
CONCUR_UPDATABLE
:
ResultSet
.
CONCUR_READ_ONLY
);
updatable
?
ResultSet
.
CONCUR_UPDATABLE
:
ResultSet
.
CONCUR_READ_ONLY
);
}
}
catch
(
SQLFeatureNotSupportedException
|
UnsupportedOperationException
|
IncompatibleClassChangeError
e
)
{
catch
(
SQLFeatureNotSupportedException
|
UnsupportedOperationException
|
IncompatibleClassChangeError
e
)
{
return
prepareStatement
(
sqlQuery
);
dbStat
=
prepareStatement
(
sqlQuery
);
}
}
catch
(
SQLException
e
)
{
catch
(
SQLException
e
)
{
if
(
DBUtils
.
discoverErrorType
(
getDataSource
(),
e
)
==
DBPErrorAssistant
.
ErrorType
.
FEATURE_UNSUPPORTED
)
{
if
(
DBUtils
.
discoverErrorType
(
getDataSource
(),
e
)
==
DBPErrorAssistant
.
ErrorType
.
FEATURE_UNSUPPORTED
)
{
return
prepareStatement
(
sqlQuery
);
dbStat
=
prepareStatement
(
sqlQuery
);
}
else
{
}
else
{
throw
e
;
throw
e
;
}
}
}
}
disableStatementEscapeProcessing
(
dbStat
);
return
dbStat
;
}
}
}
}
catch
(
SQLException
e
)
{
catch
(
SQLException
e
)
{
...
@@ -194,6 +201,17 @@ public class JDBCConnectionImpl extends AbstractSession implements JDBCSession,
...
@@ -194,6 +201,17 @@ public class JDBCConnectionImpl extends AbstractSession implements JDBCSession,
}
}
}
}
// Disable escaping (#3512)
private
void
disableStatementEscapeProcessing
(
JDBCStatement
statement
)
{
if
(
statement
!=
null
)
{
try
{
statement
.
setEscapeProcessing
(
false
);
}
catch
(
Throwable
e
)
{
log
.
debug
(
e
);
}
}
}
@NotNull
@NotNull
@Override
@Override
public
DBDValueHandler
getDefaultValueHandler
()
public
DBDValueHandler
getDefaultValueHandler
()
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录