Support SQUARE brackets [] around NAMED parameter

spring-projects · Dec 14, 2021 · 86eda27 · 86eda27
1 parent aeff664
commit 86eda27
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
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
@@ -48,6 +48,7 @@
  * @author Thomas Risberg
  * @author Juergen Hoeller
  * @author Mark Paluch
+ * @author Anton Naydenov
  * @since 5.3
  */
 abstract class NamedParameterUtils {
@@ -66,7 +67,7 @@ abstract class NamedParameterUtils {
 	 * Set of characters that qualify as parameter separators,
 	 * indicating that a parameter name in an 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-r2dbc/src/test/java/org/springframework/r2dbc/core/NamedParameterUtilsUnitTests.java b/spring-r2dbc/src/test/java/org/springframework/r2dbc/core/NamedParameterUtilsUnitTests.java
@@ -38,6 +38,7 @@
  *
  * @author Mark Paluch
  * @author Jens Schauder
+ * @author Anton Naydenov
  */
 public class NamedParameterUtilsUnitTests {
 
@@ -274,6 +275,18 @@ public void parseSqlStatementWithQuotesAndCommentAfter() {
 		assertThat(psql2.getParameterNames()).containsExactly("xxx");
 	}
 
+	@Test public void parseSqlStatementWithSquareBracket() {
+		// given
+		String sql = "SELECT ARRAY[:ext]";
+
+		// when
+		ParsedSql psql = NamedParameterUtils.parseSqlStatement(sql);
+
+		//then
+		assertThat(psql.getNamedParameterCount()).isEqualTo(1);
+		assertThat(psql.getParameterNames()).containsExactly("ext");
+	}
+
 	@Test
 	public void shouldAllowParsingMultipleUseOfParameter() {