TYPE should be a valid attribute of an entity for a custom query.

See #3062, #3056.
spring-projects · Jul 10, 2023 · d232038 · d232038
1 parent f7d1c88
commit d232038
Show file tree

Hide file tree

Showing 3 changed files with 15 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
@@ -604,6 +604,7 @@ identification_variable
     | OUTER
     | FLOOR
     | SIGN
+    | TYPE
     | VALUE)
     ;
 

diff --git a/...pa/src/test/java/org/springframework/data/jpa/repository/query/HqlQueryRendererTests.java b/...pa/src/test/java/org/springframework/data/jpa/repository/query/HqlQueryRendererTests.java
@@ -1549,4 +1549,11 @@ void binaryLiteralsShouldWork() {
 	void escapeClauseShouldWork() {
 		assertQuery("select t.name from SomeDbo t where t.name LIKE :name escape '\\\\'");
 	}
+
+	@Test // GH-3062, GH-3056
+	void typeShouldBeAValidParameter() {
+
+		assertQuery("select e from Employee e where e.type = :_type");
+		assertQuery("select te from TestEntity te where te.type = :type");
+	}
 }
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
@@ -941,4 +941,11 @@ void queryWithSignShouldWork() {
 	void queryWithValueShouldWork() {
 		assertQuery("select t.value from TestEntity t");
 	}
+
+	@Test // GH-3062, GH-3056
+	void typeShouldBeAValidParameter() {
+
+		assertQuery("select e from Employee e where e.type = :_type");
+		assertQuery("select te from TestEntity te where te.type = :type");
+	}
 }