From 44fd2d96cc0af01266b7af8eeefa7a524ff6f0ac Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Sun, 14 Jan 2018 17:57:32 +0100 Subject: [PATCH] Restore original separator set (but keep new isParameterSeparator impl) Issue: SPR-16340 --- .../jdbc/core/namedparam/NamedParameterUtils.java | 2 +- .../jdbc/core/namedparam/NamedParameterJdbcTemplateTests.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterUtils.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterUtils.java index 92863785d0..013a79923e 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterUtils.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterUtils.java @@ -55,7 +55,7 @@ public abstract class NamedParameterUtils { * Set of characters that qualify as parameter separators, * indicating that a parameter name in a SQL String has ended. */ - private static final String PARAMETER_SEPARATORS = "\"':&,;()[]|=+-*%/\\<>^"; + private static final String PARAMETER_SEPARATORS = "\"':&,;()|=+-*%/\\<>^"; /** * An index with separator flags per character code. diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplateTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplateTests.java index e14f4b5a06..951f483fd3 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplateTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplateTests.java @@ -31,6 +31,7 @@ import java.util.Map; import javax.sql.DataSource; import org.junit.Before; +import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; @@ -145,6 +146,7 @@ public class NamedParameterJdbcTemplateTests { verify(connection).close(); } + @Ignore("SPR-16340") @Test public void testExecuteArray() throws SQLException { given(preparedStatement.executeUpdate()).willReturn(1);