Remove square brackets with index/key expressions from generated SQL

See gh-27925
spring-projects · Oct 19, 2022 · aaa22ad · aaa22ad
1 parent affccba
commit aaa22ad
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
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
@@ -147,8 +147,10 @@ public static ParsedSql parseSqlStatement(String sql) {
 					}
 					if (j - i > 1) {
 						parameter = sql.substring(i + 1, j);
-						if (parameter.contains("[")) {
-							parameter += "]";  // preserve end bracket for index/key
+						if (j < statement.length && statement[j] == ']' && parameter.contains("[")) {
+							// preserve end bracket for index/key
+							j++;
+							parameter = sql.substring(i + 1, j);
 						}
 						namedParameterCount = addNewNamedParameter(
 								namedParameters, namedParameterCount, parameter);

diff --git a/...jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterUtilsTests.java b/...jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterUtilsTests.java
@@ -325,6 +325,9 @@ public void parseSqlStatementWithSquareBracket() {
 		ParsedSql psql = NamedParameterUtils.parseSqlStatement(sql);
 		assertThat(psql.getNamedParameterCount()).isEqualTo(1);
 		assertThat(psql.getParameterNames()).containsExactly("ext");
+
+		String sqlToUse = NamedParameterUtils.substituteNamedParameters(psql, null);
+		assertThat(sqlToUse).isEqualTo("SELECT ARRAY[?]");
 	}
 
 	@Test  // gh-27925
@@ -345,11 +348,14 @@ public Map<String, Object> getHeaders() {
 		}
 
 		Foo foo = new Foo();
-		Object[] params = NamedParameterUtils.buildValueArray(psql,
-				new BeanPropertySqlParameterSource(foo), null);
+		SqlParameterSource paramSource = new BeanPropertySqlParameterSource(foo);
+		Object[] params = NamedParameterUtils.buildValueArray(psql, paramSource, null);
 
 		assertThat(params[0]).isInstanceOf(SqlParameterValue.class);
 		assertThat(((SqlParameterValue) params[0]).getValue()).isEqualTo(foo.getHeaders().get("id"));
+
+		String sqlToUse = NamedParameterUtils.substituteNamedParameters(psql, paramSource);
+		assertThat(sqlToUse).isEqualTo("insert into foos (id) values (?)");
 	}
 
 }
diff --git a/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/NamedParameterUtils.java b/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/NamedParameterUtils.java
@@ -160,8 +160,10 @@ public static ParsedSql parseSqlStatement(String sql) {
 					}
 					if (j - i > 1) {
 						parameter = sql.substring(i + 1, j);
-						if (parameter.contains("[")) {
-							parameter += "]";  // preserve end bracket for index/key
+						if (j < statement.length && statement[j] == ']' && parameter.contains("[")) {
+							// preserve end bracket for index/key
+							j++;
+							parameter = sql.substring(i + 1, j);
 						}
 						namedParameterCount = addNewNamedParameter(
 								namedParameters, namedParameterCount, parameter);