root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

NamedParameterJdbcTemplate only treats Iterables like Collections 

Closes gh-22981
This commit is contained in:
Juergen Hoeller 2019-06-12 13:29:07 +02:00
parent bee4fb0615
commit 98a49b46b7
3 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
spring-jdbc/src/main/java/org/springframework/jdbc/core/PreparedStatementCreatorFactory.java
View File

@ -31,7 +31,6 @@ import java.util.Set;
import org.springframework.dao.InvalidDataAccessApiUsageException; import org.springframework.dao.InvalidDataAccessApiUsageException;
import org.springframework.lang.Nullable; import org.springframework.lang.Nullable;
import org.springframework.util.Assert; import org.springframework.util.Assert;
import org.springframework.util.ObjectUtils;
/** /**
* Helper class that efficiently creates multiple {@link PreparedStatementCreator} * Helper class that efficiently creates multiple {@link PreparedStatementCreator}
@ -268,19 +267,13 @@ public class PreparedStatementCreatorFactory {
} }
declaredParameter = declaredParameters.get(i); declaredParameter = declaredParameters.get(i);
} }
if (in != null && in.getClass().isArray()) {
in = Arrays.asList(ObjectUtils.toObjectArray(in));
}
if (in instanceof Iterable && declaredParameter.getSqlType() != Types.ARRAY) { if (in instanceof Iterable && declaredParameter.getSqlType() != Types.ARRAY) {
Iterable<?> entries = (Iterable<?>) in; Iterable<?> entries = (Iterable<?>) in;
for (Object entry : entries) { for (Object entry : entries) {
if (entry != null && entry.getClass().isArray()) { if (entry instanceof Object[]) {
entry = Arrays.asList(ObjectUtils.toObjectArray(entry)); Object[] valueArray = (Object[]) entry;
} for (Object argValue : valueArray) {
if (entry instanceof Iterable) { StatementCreatorUtils.setParameterValue(ps, sqlColIndx++, declaredParameter, argValue);
Iterable<?> values = (Iterable<?>) entry;
for (Object value : values) {
StatementCreatorUtils.setParameterValue(ps, sqlColIndx++, declaredParameter, value);
} }
} }
else { else {

5
spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterUtils.java
View File

@ -17,7 +17,6 @@
package org.springframework.jdbc.core.namedparam; package org.springframework.jdbc.core.namedparam;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet; import java.util.HashSet;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
@ -29,7 +28,6 @@ import org.springframework.jdbc.core.SqlParameter;
import org.springframework.jdbc.core.SqlParameterValue; import org.springframework.jdbc.core.SqlParameterValue;
import org.springframework.lang.Nullable; import org.springframework.lang.Nullable;
import org.springframework.util.Assert; import org.springframework.util.Assert;
import org.springframework.util.ObjectUtils;
/** /**
* Helper methods for named parameter parsing. * Helper methods for named parameter parsing.
@ -285,9 +283,6 @@ public abstract class NamedParameterUtils {
if (value instanceof SqlParameterValue) { if (value instanceof SqlParameterValue) {
value = ((SqlParameterValue) value).getValue(); value = ((SqlParameterValue) value).getValue();
} }
if (value != null && value.getClass().isArray()) {
value = Arrays.asList(ObjectUtils.toObjectArray(value));
}
if (value instanceof Iterable) { if (value instanceof Iterable) {
Iterator<?> entryIter = ((Iterable<?>) value).iterator(); Iterator<?> entryIter = ((Iterable<?>) value).iterator();
int k = 0; int k = 0;

6
spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplateTests.java
View File

@ -477,7 +477,7 @@ public class NamedParameterJdbcTemplateTests {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
Map<String, Object>[] parameters = new Map[3]; Map<String, Object>[] parameters = new Map[3];
parameters[0] = Collections.singletonMap("ids", Arrays.asList(1, 2)); parameters[0] = Collections.singletonMap("ids", Arrays.asList(1, 2));
parameters[1] = Collections.singletonMap("ids", new Integer[] {3, 4}); parameters[1] = Collections.singletonMap("ids", Arrays.asList("3", "4"));
parameters[2] = Collections.singletonMap("ids", (Iterable<Integer>) () -> Arrays.asList(5, 6).iterator()); parameters[2] = Collections.singletonMap("ids", (Iterable<Integer>) () -> Arrays.asList(5, 6).iterator());
final int[] rowsAffected = new int[] {1, 2, 3}; final int[] rowsAffected = new int[] {1, 2, 3};
@ -500,8 +500,8 @@ public class NamedParameterJdbcTemplateTests {
inOrder.verify(preparedStatement).setObject(2, 2); inOrder.verify(preparedStatement).setObject(2, 2);
inOrder.verify(preparedStatement).addBatch(); inOrder.verify(preparedStatement).addBatch();
inOrder.verify(preparedStatement).setObject(1, 3); inOrder.verify(preparedStatement).setString(1, "3");
inOrder.verify(preparedStatement).setObject(2, 4); inOrder.verify(preparedStatement).setString(2, "4");
inOrder.verify(preparedStatement).addBatch(); inOrder.verify(preparedStatement).addBatch();
inOrder.verify(preparedStatement).setObject(1, 5); inOrder.verify(preparedStatement).setObject(1, 5);