Properly handle reserved words as entity names.

In JPQL and HQL, we need to properly handle reserved words that crop up as entity names (which is legal).

See #2982.

Author: gregturn

Diff for: spring-data-jpa/src/main/antlr4/org/springframework/data/jpa/repository/query/Hql.g4

@@ -713,6 +713,7 @@ reservedWord
 	| FETCH
 	| FILTER
 	| FIRST
+	| FLOOR
 	| FOLLOWING
 	| FOR
 	| FORMAT

Diff for: spring-data-jpa/src/main/antlr4/org/springframework/data/jpa/repository/query/Jpql.g4

@@ -596,12 +596,13 @@ trim_character
 
 identification_variable
     : IDENTIFICATION_VARIABLE
-    | ORDER // Gap in the spec requires supporting 'Order' as an entity name
-    | COUNT // Gap in the spec requires supporting 'count' as a possible name
-    | KEY // Gap in the sepc requires supported 'key' as a possible name
-    | LEFT
+    | f=(COUNT
     | INNER
+    | KEY
+    | LEFT
+    | ORDER
     | OUTER
+    | FLOOR)
     ;
 
 constructor_name
@@ -682,8 +683,7 @@ collection_value_field
     ;
 
 entity_name
-    : identification_variable
-    | identification_variable ('.' identification_variable)* // Hibernate sometimes expands the entity name to FQDN when using named queries
+    : identification_variable ('.' identification_variable)* // Hibernate sometimes expands the entity name to FQDN when using named queries
     ;
 
 result_variable

Diff for: spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/JpqlQueryRenderer.java

@@ -2118,12 +2118,8 @@ public List<JpaQueryParsingToken> visitIdentification_variable(JpqlParser.Identi
 
 		if (ctx.IDENTIFICATION_VARIABLE() != null) {
 			return List.of(new JpaQueryParsingToken(ctx.IDENTIFICATION_VARIABLE()));
-		} else if (ctx.COUNT() != null) {
-			return List.of(new JpaQueryParsingToken(ctx.COUNT()));
-		} else if (ctx.ORDER() != null) {
-			return List.of(new JpaQueryParsingToken(ctx.ORDER()));
-		} else if (ctx.KEY() != null) {
-			return List.of(new JpaQueryParsingToken(ctx.KEY()));
+		} else if (ctx.f != null) {
+			return List.of(new JpaQueryParsingToken(ctx.f));
 		} else {
 			return List.of();
 		}

Diff for: spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/HqlQueryRendererTests.java

@@ -1499,4 +1499,21 @@ WITH maxId AS(select max(sr.snapshot.id) snapshotId from SnapshotReference sr
 				select sr from maxId m join SnapshotReference sr on sr.snapshot.id = m.snapshotId
 				""");
 	}
+
+	@Test // GH-2982
+	void floorShouldBeValidEntityName() {
+
+		assertQuery("""
+				SELECT f
+				FROM Floor f
+				WHERE f.name = :name
+				""");
+
+		assertQuery("""
+				SELECT r
+				FROM Room r
+				JOIN r.floor f
+				WHERE f.name = :name
+				""");
+	}
 }

Diff for: spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/JpqlQueryRendererTests.java

@@ -914,4 +914,21 @@ void theRest38() {
 				WHERE l.product.name = ?1
 				""");
 	}
+
+	@Test // GH-2982
+	void floorShouldBeValidEntityName() {
+
+		assertQuery("""
+				SELECT f
+				FROM Floor f
+				WHERE f.name = :name
+				""");
+
+		assertQuery("""
+				SELECT r
+				FROM Room r
+				JOIN r.floor f
+				WHERE f.name = :name
+				""");
+	}
 }