TIME should be valid parameter name for JPQL queries.

See #3093
spring-projects · Aug 2, 2023 · 7eeca10 · 7eeca10
1 parent 10c26d2
commit 7eeca10
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/spring-data-jpa/src/main/antlr4/org/springframework/data/jpa/repository/query/Jpql.g4 b/spring-data-jpa/src/main/antlr4/org/springframework/data/jpa/repository/query/Jpql.g4
@@ -606,6 +606,7 @@ identification_variable
     | OUTER
     | FLOOR
     | SIGN
+    | TIME
     | TYPE
     | VALUE)
     ;

diff --git a/...ta-jpa/src/main/java/org/springframework/data/jpa/repository/query/JpqlQueryRenderer.java b/...ta-jpa/src/main/java/org/springframework/data/jpa/repository/query/JpqlQueryRenderer.java
@@ -544,9 +544,11 @@ public List<JpaQueryParsingToken> visitUpdate_clause(JpqlParser.Update_clauseCon
 
 		ctx.update_item().forEach(updateItemContext -> {
 			tokens.addAll(visit(updateItemContext));
+			NOSPACE(tokens);
 			tokens.add(TOKEN_COMMA);
 		});
 		CLIP(tokens);
+		SPACE(tokens);
 
 		return tokens;
 	}

diff --git a/...a/src/test/java/org/springframework/data/jpa/repository/query/JpqlQueryRendererTests.java b/...a/src/test/java/org/springframework/data/jpa/repository/query/JpqlQueryRendererTests.java
@@ -958,4 +958,13 @@ void alternateNotEqualsOperatorShouldWork() {
 	void dateAndFromShouldBeValidNames() {
 		assertQuery("SELECT e FROM Entity e WHERE e.embeddedId.date BETWEEN :from AND :to");
 	}
+
+	@Test // GH-3092
+	void timeShouldBeAValidParameterName() {
+		assertQuery("""
+				UPDATE Lock L
+				SET L.isLocked = TRUE, L.forceUnlockTime = :forceUnlockTime
+				WHERE L.isLocked = FALSE OR L.forceUnlockTime < :time
+				""");
+	}
 }