Fix entity name expansion templated native queries.

ExpressionBasedStringQuery now correctly expands the entityName placeholder again.

Closes #3979

Author: mp911de

spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/AbstractStringBasedJpaQuery.java

@@ -80,15 +80,12 @@ public AbstractStringBasedJpaQuery(JpaQueryMethod method, EntityManager em, Stri
 
 		this.valueExpressionDelegate = valueExpressionDelegate;
 		this.valueExpressionContextProvider = valueExpressionDelegate.createValueContextProvider(method.getParameters());
-		this.query = new ExpressionBasedStringQuery(queryString, method.getEntityInformation(), valueExpressionDelegate,
-				method.isNativeQuery());
+		this.query = new ExpressionBasedStringQuery(queryString, method, valueExpressionDelegate);
 
 		this.countQuery = Lazy.of(() -> {
 
 			if (StringUtils.hasText(countQueryString)) {
-
-				return new ExpressionBasedStringQuery(countQueryString, method.getEntityInformation(), valueExpressionDelegate,
-						method.isNativeQuery());
+				return new ExpressionBasedStringQuery(countQueryString, method, valueExpressionDelegate);
 			}
 
 			return query.deriveCountQuery(method.getCountQueryProjection());

spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/ExpressionBasedStringQuery.java

@@ -52,6 +52,17 @@ class ExpressionBasedStringQuery extends StringQuery {
 	private static final String ENTITY_NAME_VARIABLE = "#" + ENTITY_NAME;
 	private static final String ENTITY_NAME_VARIABLE_EXPRESSION = "#{" + ENTITY_NAME_VARIABLE;
 
+	/**
+	 * Creates a new {@link ExpressionBasedStringQuery} for the given query and {@link JpaQueryMethod}.
+	 *
+	 * @param query must not be {@literal null} or empty.
+	 * @param queryMethod must not be {@literal null} or empty.
+	 * @param parser must not be {@literal null}.
+	 */
+	public ExpressionBasedStringQuery(String query, JpaQueryMethod queryMethod, ValueExpressionParser parser) {
+		this(query, queryMethod.getEntityInformation(), parser, queryMethod.isNativeQuery());
+	}
+
 	/**
 	 * Creates a new {@link ExpressionBasedStringQuery} for the given query and {@link EntityMetadata}.
 	 *
@@ -62,7 +73,7 @@ class ExpressionBasedStringQuery extends StringQuery {
 	 */
 	public ExpressionBasedStringQuery(String query, JpaEntityMetadata<?> metadata, ValueExpressionParser parser,
 			boolean nativeQuery) {
-		super(renderQueryIfExpressionOrReturnQuery(query, metadata, parser), nativeQuery && !containsExpression(query));
+		super(renderQueryIfExpressionOrReturnQuery(query, metadata, parser), nativeQuery);
 	}
 
 	/**

spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/ExpressionBasedStringQueryUnitTests.java

@@ -97,25 +97,13 @@ void shouldDetectBindParameterCountCorrectlyWithJDBCStyleParameters() {
 		assertThat(query.getParameterBindings()).hasSize(8);
 	}
 
-	@Test
-	void shouldDetectComplexNativeQueriesWithSpelAsNonNative() {
-
-		StringQuery query = new ExpressionBasedStringQuery(
-				"select n from #{#entityName} n where (LOWER(n.name) LIKE LOWER(NULLIF(text(concat('%',?#{#networkRequest.name},'%')), '')) OR ?#{#networkRequest.name} IS NULL )"
-						+ "AND (LOWER(n.server) LIKE LOWER(NULLIF(text(concat('%',?#{#networkRequest.server},'%')), '')) OR ?#{#networkRequest.server} IS NULL)"
-						+ "AND (n.createdAt >= ?#{#networkRequest.createdTime.startDateTime}) AND (n.createdAt <=?#{#networkRequest.createdTime.endDateTime})"
-						+ "AND (n.updatedAt >= ?#{#networkRequest.updatedTime.startDateTime}) AND (n.updatedAt <=?#{#networkRequest.updatedTime.endDateTime})",
-				metadata, PARSER, true);
-
-		assertThat(query.isNativeQuery()).isFalse();
-	}
+	@Test // GH-3979
+	void shouldExpandExpressionUsingNativeQueries() {
 
-	@Test
-	void shouldDetectSimpleNativeQueriesWithSpelAsNonNative() {
-
-		StringQuery query = new ExpressionBasedStringQuery("select n from #{#entityName} n", metadata, PARSER, true);
+		StringQuery query = new ExpressionBasedStringQuery("select n.* from #{#entityName} n", metadata, PARSER, true);
 
-		assertThat(query.isNativeQuery()).isFalse();
+		assertThat(query.isNativeQuery()).isTrue();
+		assertThat(query.getQueryString()).isEqualTo("select n.* from User n");
 	}
 
 	@Test

spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/sample/UserRepository.java

@@ -607,7 +607,7 @@ Page<User> findAllOrderedBySpecialNameMultipleParams(@Param("name") String name,
 	Map<String, Object> findMapWithNullValues();
 
 	// DATAJPA-1307
-	@Query(value = "select * from SD_User u where u.emailAddress = ?", nativeQuery = true)
+	@Query(value = "select * from SD_#{#entityName} u where u.emailAddress = ?", nativeQuery = true)
 	User findByEmailNativeAddressJdbcStyleParameter(String emailAddress);
 
 	// DATAJPA-1334