Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
9c42fd7f
S
spring-framework
项目概览
爱吃血肠
/
spring-framework
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
spring-framework
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
9c42fd7f
编写于
2月 28, 2019
作者:
J
Juergen Hoeller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
JdbcTemplate preserves order of stored procedure output parameters
Closes gh-22491
上级
e583da07
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
37 addition
and
40 deletion
+37
-40
spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcTemplate.java
...main/java/org/springframework/jdbc/core/JdbcTemplate.java
+37
-40
未找到文件。
spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcTemplate.java
浏览文件 @
9c42fd7f
/*
* Copyright 2002-201
8
the original author or authors.
* Copyright 2002-201
9
the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
...
...
@@ -31,7 +31,6 @@ import java.sql.Statement;
import
java.util.ArrayList
;
import
java.util.Collection
;
import
java.util.Collections
;
import
java.util.HashMap
;
import
java.util.LinkedHashMap
;
import
java.util.List
;
import
java.util.Map
;
...
...
@@ -1150,12 +1149,12 @@ public class JdbcTemplate extends JdbcAccessor implements JdbcOperations {
logger
.
trace
(
"CallableStatement.execute() returned '"
+
retVal
+
"'"
);
logger
.
trace
(
"CallableStatement.getUpdateCount() returned "
+
updateCount
);
}
Map
<
String
,
Object
>
re
turnedRe
sults
=
createResultsMap
();
Map
<
String
,
Object
>
results
=
createResultsMap
();
if
(
retVal
||
updateCount
!=
-
1
)
{
re
turnedRe
sults
.
putAll
(
extractReturnedResults
(
cs
,
updateCountParameters
,
resultSetParameters
,
updateCount
));
results
.
putAll
(
extractReturnedResults
(
cs
,
updateCountParameters
,
resultSetParameters
,
updateCount
));
}
re
turnedRe
sults
.
putAll
(
extractOutputParameters
(
cs
,
callParameters
));
return
re
turnedRe
sults
;
results
.
putAll
(
extractOutputParameters
(
cs
,
callParameters
));
return
results
;
});
Assert
.
state
(
result
!=
null
,
"No result map"
);
...
...
@@ -1173,7 +1172,7 @@ public class JdbcTemplate extends JdbcAccessor implements JdbcOperations {
@Nullable
List
<
SqlParameter
>
updateCountParameters
,
@Nullable
List
<
SqlParameter
>
resultSetParameters
,
int
updateCount
)
throws
SQLException
{
Map
<
String
,
Object
>
re
turnedResults
=
new
HashMap
<>(
);
Map
<
String
,
Object
>
re
sults
=
new
LinkedHashMap
<>(
4
);
int
rsIndex
=
0
;
int
updateIndex
=
0
;
boolean
moreResults
;
...
...
@@ -1182,7 +1181,7 @@ public class JdbcTemplate extends JdbcAccessor implements JdbcOperations {
if
(
updateCount
==
-
1
)
{
if
(
resultSetParameters
!=
null
&&
resultSetParameters
.
size
()
>
rsIndex
)
{
SqlReturnResultSet
declaredRsParam
=
(
SqlReturnResultSet
)
resultSetParameters
.
get
(
rsIndex
);
re
turnedRe
sults
.
putAll
(
processResultSet
(
cs
.
getResultSet
(),
declaredRsParam
));
results
.
putAll
(
processResultSet
(
cs
.
getResultSet
(),
declaredRsParam
));
rsIndex
++;
}
else
{
...
...
@@ -1192,7 +1191,7 @@ public class JdbcTemplate extends JdbcAccessor implements JdbcOperations {
if
(
logger
.
isTraceEnabled
())
{
logger
.
trace
(
"Added default SqlReturnResultSet parameter named '"
+
rsName
+
"'"
);
}
re
turnedRe
sults
.
putAll
(
processResultSet
(
cs
.
getResultSet
(),
undeclaredRsParam
));
results
.
putAll
(
processResultSet
(
cs
.
getResultSet
(),
undeclaredRsParam
));
rsIndex
++;
}
}
...
...
@@ -1201,7 +1200,7 @@ public class JdbcTemplate extends JdbcAccessor implements JdbcOperations {
if
(
updateCountParameters
!=
null
&&
updateCountParameters
.
size
()
>
updateIndex
)
{
SqlReturnUpdateCount
ucParam
=
(
SqlReturnUpdateCount
)
updateCountParameters
.
get
(
updateIndex
);
String
declaredUcName
=
ucParam
.
getName
();
re
turnedRe
sults
.
put
(
declaredUcName
,
updateCount
);
results
.
put
(
declaredUcName
,
updateCount
);
updateIndex
++;
}
else
{
...
...
@@ -1210,7 +1209,7 @@ public class JdbcTemplate extends JdbcAccessor implements JdbcOperations {
if
(
logger
.
isTraceEnabled
())
{
logger
.
trace
(
"Added default SqlReturnUpdateCount parameter named '"
+
undeclaredName
+
"'"
);
}
re
turnedRe
sults
.
put
(
undeclaredName
,
updateCount
);
results
.
put
(
undeclaredName
,
updateCount
);
updateIndex
++;
}
}
...
...
@@ -1223,7 +1222,7 @@ public class JdbcTemplate extends JdbcAccessor implements JdbcOperations {
}
while
(
moreResults
||
updateCount
!=
-
1
);
}
return
re
turnedRe
sults
;
return
results
;
}
/**
...
...
@@ -1235,7 +1234,7 @@ public class JdbcTemplate extends JdbcAccessor implements JdbcOperations {
protected
Map
<
String
,
Object
>
extractOutputParameters
(
CallableStatement
cs
,
List
<
SqlParameter
>
parameters
)
throws
SQLException
{
Map
<
String
,
Object
>
re
turnedResults
=
new
HashMap
<>(
);
Map
<
String
,
Object
>
re
sults
=
new
LinkedHashMap
<>(
parameters
.
size
()
);
int
sqlColIndex
=
1
;
for
(
SqlParameter
param
:
parameters
)
{
if
(
param
instanceof
SqlOutParameter
)
{
...
...
@@ -1244,25 +1243,25 @@ public class JdbcTemplate extends JdbcAccessor implements JdbcOperations {
SqlReturnType
returnType
=
outParam
.
getSqlReturnType
();
if
(
returnType
!=
null
)
{
Object
out
=
returnType
.
getTypeValue
(
cs
,
sqlColIndex
,
outParam
.
getSqlType
(),
outParam
.
getTypeName
());
re
turnedRe
sults
.
put
(
outParam
.
getName
(),
out
);
results
.
put
(
outParam
.
getName
(),
out
);
}
else
{
Object
out
=
cs
.
getObject
(
sqlColIndex
);
if
(
out
instanceof
ResultSet
)
{
if
(
outParam
.
isResultSetSupported
())
{
re
turnedRe
sults
.
putAll
(
processResultSet
((
ResultSet
)
out
,
outParam
));
results
.
putAll
(
processResultSet
((
ResultSet
)
out
,
outParam
));
}
else
{
String
rsName
=
outParam
.
getName
();
SqlReturnResultSet
rsParam
=
new
SqlReturnResultSet
(
rsName
,
getColumnMapRowMapper
());
re
turnedRe
sults
.
putAll
(
processResultSet
((
ResultSet
)
out
,
rsParam
));
results
.
putAll
(
processResultSet
((
ResultSet
)
out
,
rsParam
));
if
(
logger
.
isTraceEnabled
())
{
logger
.
trace
(
"Added default SqlReturnResultSet parameter named '"
+
rsName
+
"'"
);
}
}
}
else
{
re
turnedRe
sults
.
put
(
outParam
.
getName
(),
out
);
results
.
put
(
outParam
.
getName
(),
out
);
}
}
}
...
...
@@ -1270,7 +1269,7 @@ public class JdbcTemplate extends JdbcAccessor implements JdbcOperations {
sqlColIndex
++;
}
}
return
re
turnedRe
sults
;
return
results
;
}
/**
...
...
@@ -1282,31 +1281,29 @@ public class JdbcTemplate extends JdbcAccessor implements JdbcOperations {
protected
Map
<
String
,
Object
>
processResultSet
(
@Nullable
ResultSet
rs
,
ResultSetSupportingSqlParameter
param
)
throws
SQLException
{
if
(
rs
==
null
)
{
return
Collections
.
emptyMap
();
}
Map
<
String
,
Object
>
returnedResults
=
new
HashMap
<>();
try
{
if
(
param
.
getRowMapper
()
!=
null
)
{
RowMapper
<?>
rowMapper
=
param
.
getRowMapper
();
Object
result
=
(
new
RowMapperResultSetExtractor
<>(
rowMapper
)).
extractData
(
rs
);
returnedResults
.
put
(
param
.
getName
(),
result
);
}
else
if
(
param
.
getRowCallbackHandler
()
!=
null
)
{
RowCallbackHandler
rch
=
param
.
getRowCallbackHandler
();
(
new
RowCallbackHandlerResultSetExtractor
(
rch
)).
extractData
(
rs
);
returnedResults
.
put
(
param
.
getName
(),
"ResultSet returned from stored procedure was processed"
);
if
(
rs
!=
null
)
{
try
{
if
(
param
.
getRowMapper
()
!=
null
)
{
RowMapper
<?>
rowMapper
=
param
.
getRowMapper
();
Object
result
=
(
new
RowMapperResultSetExtractor
<>(
rowMapper
)).
extractData
(
rs
);
return
Collections
.
singletonMap
(
param
.
getName
(),
result
);
}
else
if
(
param
.
getRowCallbackHandler
()
!=
null
)
{
RowCallbackHandler
rch
=
param
.
getRowCallbackHandler
();
(
new
RowCallbackHandlerResultSetExtractor
(
rch
)).
extractData
(
rs
);
return
Collections
.
singletonMap
(
param
.
getName
(),
"ResultSet returned from stored procedure was processed"
);
}
else
if
(
param
.
getResultSetExtractor
()
!=
null
)
{
Object
result
=
param
.
getResultSetExtractor
().
extractData
(
rs
);
return
Collections
.
singletonMap
(
param
.
getName
(),
result
);
}
}
else
if
(
param
.
getResultSetExtractor
()
!=
null
)
{
Object
result
=
param
.
getResultSetExtractor
().
extractData
(
rs
);
returnedResults
.
put
(
param
.
getName
(),
result
);
finally
{
JdbcUtils
.
closeResultSet
(
rs
);
}
}
finally
{
JdbcUtils
.
closeResultSet
(
rs
);
}
return
returnedResults
;
return
Collections
.
emptyMap
();
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录