Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
bde93e4d
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,发现更多精彩内容 >>
提交
bde93e4d
编写于
4月 12, 2018
作者:
S
serge-rider
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
SQL statements parameters formatting improved
上级
efcbd5da
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
68 addition
and
29 deletion
+68
-29
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/exec/DBCParameterizedStatement.java
...g/jkiss/dbeaver/model/exec/DBCParameterizedStatement.java
+0
-6
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/data/ExecuteBatchImpl.java
...c/org/jkiss/dbeaver/model/impl/data/ExecuteBatchImpl.java
+59
-12
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/jdbc/exec/JDBCPreparedStatementImpl.java
...eaver/model/impl/jdbc/exec/JDBCPreparedStatementImpl.java
+3
-10
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/sql/SQLUtils.java
...eaver.model/src/org/jkiss/dbeaver/model/sql/SQLUtils.java
+6
-1
未找到文件。
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/exec/DBCParameterizedStatement.java
浏览文件 @
bde93e4d
...
...
@@ -25,10 +25,4 @@ public interface DBCParameterizedStatement extends DBCStatement
String
getFormattedQuery
();
/**
* Forces parameters save (for script generation).
* Parameters save can be disabled due to performance reasons
*/
void
forceParametersSave
(
boolean
force
);
}
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/data/ExecuteBatchImpl.java
浏览文件 @
bde93e4d
...
...
@@ -22,17 +22,19 @@ import org.jkiss.code.Nullable;
import
org.jkiss.dbeaver.model.DBUtils
;
import
org.jkiss.dbeaver.model.data.DBDAttributeBinding
;
import
org.jkiss.dbeaver.model.data.DBDDataReceiver
;
import
org.jkiss.dbeaver.model.data.DBDDisplayFormat
;
import
org.jkiss.dbeaver.model.data.DBDValueHandler
;
import
org.jkiss.dbeaver.model.edit.DBEPersistAction
;
import
org.jkiss.dbeaver.model.exec.*
;
import
org.jkiss.dbeaver.model.impl.edit.SQLDatabasePersistAction
;
import
org.jkiss.dbeaver.model.sql.SQLUtils
;
import
org.jkiss.dbeaver.model.struct.DBSAttributeBase
;
import
org.jkiss.dbeaver.model.struct.DBSDataManipulator
;
import
org.jkiss.dbeaver.model.struct.DBSTypedObject
;
import
org.jkiss.utils.ArrayUtils
;
import
org.jkiss.utils.CommonUtils
;
import
java.util.ArrayList
;
import
java.util.Arrays
;
import
java.util.List
;
import
java.util.*
;
/**
* Execute batch.
...
...
@@ -142,9 +144,6 @@ public abstract class ExecuteBatchImpl implements DBSDataManipulator.ExecuteBatc
}
if
(
statement
==
null
||
!
reuse
)
{
statement
=
prepareStatement
(
session
,
rowValues
);
if
(
actions
!=
null
&&
statement
instanceof
DBCParameterizedStatement
)
{
((
DBCParameterizedStatement
)
statement
).
forceParametersSave
(
true
);
}
statistics
.
setQueryText
(
statement
.
getQueryString
());
statistics
.
addStatementsCount
();
}
...
...
@@ -175,12 +174,7 @@ public abstract class ExecuteBatchImpl implements DBSDataManipulator.ExecuteBatc
}
}
}
else
{
String
queryString
;
if
(
statement
instanceof
DBCParameterizedStatement
)
{
queryString
=
((
DBCParameterizedStatement
)
statement
).
getFormattedQuery
();
}
else
{
queryString
=
statement
.
getQueryString
();
}
String
queryString
=
formatQueryParameters
(
session
,
statement
.
getQueryString
(),
handlers
,
rowValues
);
actions
.
add
(
new
SQLDatabasePersistAction
(
"Execute statement"
,
...
...
@@ -210,6 +204,59 @@ public abstract class ExecuteBatchImpl implements DBSDataManipulator.ExecuteBatc
return
statistics
;
}
private
String
formatQueryParameters
(
DBCSession
session
,
String
queryString
,
DBDValueHandler
[]
handlers
,
Object
[]
rowValues
)
{
if
(
handlers
.
length
==
0
)
{
return
queryString
;
}
if
(
CommonUtils
.
isEmpty
(
queryString
))
{
return
queryString
;
}
int
length
=
queryString
.
length
();
StringBuilder
formatted
=
new
StringBuilder
(
length
*
2
);
int
paramIndex
=
0
;
for
(
int
i
=
0
;
i
<
length
;
i
++)
{
char
c
=
queryString
.
charAt
(
i
);
switch
(
c
)
{
case
'?'
:
{
if
(
paramIndex
>=
handlers
.
length
)
{
log
.
error
(
"Parameter index out of range ("
+
paramIndex
+
" > "
+
handlers
.
length
+
")"
);
continue
;
}
Object
paramValue
=
SQLUtils
.
convertValueToSQL
(
session
.
getDataSource
(),
attributes
[
paramIndex
],
handlers
[
paramIndex
],
rowValues
[
paramIndex
]);
formatted
.
append
(
paramValue
);
paramIndex
++;
continue
;
}
case
':'
:
{
// FIXME: process named parameters
break
;
}
case
'\''
:
case
'"'
:
{
formatted
.
append
(
c
);
for
(
int
k
=
i
+
1
;
k
<
length
;
k
++)
{
char
c2
=
queryString
.
charAt
(
k
);
if
(
c2
==
c
&&
queryString
.
charAt
(
k
-
1
)
!=
'\\'
)
{
i
=
k
;
c
=
c2
;
break
;
}
else
{
formatted
.
append
(
c2
);
}
}
break
;
}
}
formatted
.
append
(
c
);
}
return
formatted
.
toString
();
}
private
void
flushBatch
(
DBCStatistics
statistics
,
DBCStatement
statement
)
throws
DBCException
{
long
startTime
=
System
.
currentTimeMillis
();
int
[]
updatedRows
=
statement
.
executeStatementBatch
();
...
...
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/jdbc/exec/JDBCPreparedStatementImpl.java
浏览文件 @
bde93e4d
...
...
@@ -52,7 +52,6 @@ public class JDBCPreparedStatementImpl extends JDBCStatementImpl<PreparedStateme
private
static
final
Object
NULL_VALUE
=
new
Object
();
private
Map
<
Object
,
Object
>
paramMap
;
private
boolean
forceParametersSave
;
protected
static
class
ContentParameter
{
String
displayString
;
...
...
@@ -73,7 +72,7 @@ public class JDBCPreparedStatementImpl extends JDBCStatementImpl<PreparedStateme
}
}
public
JDBCPreparedStatementImpl
(
JDBCPreparedStatementImpl
(
@NotNull
JDBCSession
connection
,
@NotNull
PreparedStatement
original
,
String
query
,
...
...
@@ -148,11 +147,6 @@ public class JDBCPreparedStatementImpl extends JDBCStatementImpl<PreparedStateme
}
}
@Override
public
void
forceParametersSave
(
boolean
force
)
{
this
.
forceParametersSave
=
force
;
}
@NotNull
private
String
formatParameterValue
(
Object
value
)
{
if
(
value
instanceof
CharSequence
)
{
...
...
@@ -180,7 +174,7 @@ public class JDBCPreparedStatementImpl extends JDBCStatementImpl<PreparedStateme
protected
void
handleStatementBind
(
Object
parameter
,
@Nullable
Object
o
)
{
if
(
forceParametersSave
||
isQMLoggingEnabled
())
{
if
(
isQMLoggingEnabled
())
{
// Save parameters
if
(
o
==
null
)
{
o
=
NULL_VALUE
;
...
...
@@ -192,8 +186,7 @@ public class JDBCPreparedStatementImpl extends JDBCStatementImpl<PreparedStateme
paramMap
=
new
LinkedHashMap
<>();
}
paramMap
.
put
(
parameter
,
o
);
}
if
(
isQMLoggingEnabled
())
{
QMUtils
.
getDefaultHandler
().
handleStatementBind
(
this
,
parameter
,
o
);
}
}
...
...
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/sql/SQLUtils.java
浏览文件 @
bde93e4d
...
...
@@ -560,10 +560,15 @@ public final class SQLUtils {
}
public
static
String
convertValueToSQL
(
@NotNull
DBPDataSource
dataSource
,
@NotNull
DBSAttributeBase
attribute
,
@Nullable
Object
value
)
{
DBDValueHandler
valueHandler
=
DBUtils
.
findValueHandler
(
dataSource
,
attribute
);
return
convertValueToSQL
(
dataSource
,
attribute
,
valueHandler
,
value
);
}
public
static
String
convertValueToSQL
(
@NotNull
DBPDataSource
dataSource
,
@NotNull
DBSAttributeBase
attribute
,
@NotNull
DBDValueHandler
valueHandler
,
@Nullable
Object
value
)
{
if
(
DBUtils
.
isNullValue
(
value
))
{
return
SQLConstants
.
NULL_VALUE
;
}
DBDValueHandler
valueHandler
=
DBUtils
.
findValueHandler
(
dataSource
,
attribute
);
String
strValue
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录