Fix NullPointer when deriving a count query for non-SELECT statements, delay count query derivation

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-jpa-parent</artifactId>
-	<version>3.1.0-SNAPSHOT</version>
+	<version>3.1.0-GH-2812-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>Spring Data JPA Parent</name>

spring-data-envers/pom.xml

@@ -5,12 +5,12 @@
 
 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-envers</artifactId>
-	<version>3.1.0-SNAPSHOT</version>
+	<version>3.1.0-GH-2812-SNAPSHOT</version>
 
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-jpa-parent</artifactId>
-		<version>3.1.0-SNAPSHOT</version>
+		<version>3.1.0-GH-2812-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

spring-data-jpa-distribution/pom.xml

@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-jpa-parent</artifactId>
-		<version>3.1.0-SNAPSHOT</version>
+		<version>3.1.0-GH-2812-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

spring-data-jpa/pom.xml

@@ -6,7 +6,7 @@
 
 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-jpa</artifactId>
-	<version>3.1.0-SNAPSHOT</version>
+	<version>3.1.0-GH-2812-SNAPSHOT</version>
 
 	<name>Spring Data JPA</name>
 	<description>Spring Data module for JPA repositories.</description>
@@ -15,7 +15,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-jpa-parent</artifactId>
-		<version>3.1.0-SNAPSHOT</version>
+		<version>3.1.0-GH-2812-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

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

@@ -18,15 +18,13 @@
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.Query;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.jpa.repository.QueryRewriter;
 import org.springframework.data.repository.query.QueryMethodEvaluationContextProvider;
 import org.springframework.data.repository.query.ResultProcessor;
 import org.springframework.data.repository.query.ReturnedType;
+import org.springframework.data.util.Lazy;
 import org.springframework.expression.spel.standard.SpelExpressionParser;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
@@ -46,7 +44,7 @@
 abstract class AbstractStringBasedJpaQuery extends AbstractJpaQuery {
 
 	private final DeclaredQuery query;
-	private final DeclaredQuery countQuery;
+	private final Lazy<DeclaredQuery> countQuery;
 	private final QueryMethodEvaluationContextProvider evaluationContextProvider;
 	private final SpelExpressionParser parser;
 	private final QueryParameterSetter.QueryMetadataCache metadataCache = new QueryParameterSetter.QueryMetadataCache();
@@ -65,8 +63,8 @@ abstract class AbstractStringBasedJpaQuery extends AbstractJpaQuery {
 	 * @param queryRewriter must not be {@literal null}.
 	 */
 	public AbstractStringBasedJpaQuery(JpaQueryMethod method, EntityManager em, String queryString,
-			@Nullable String countQueryString, QueryRewriter queryRewriter, QueryMethodEvaluationContextProvider evaluationContextProvider,
-			SpelExpressionParser parser) {
+			@Nullable String countQueryString, QueryRewriter queryRewriter,
+			QueryMethodEvaluationContextProvider evaluationContextProvider, SpelExpressionParser parser) {
 
 		super(method, em);
 
@@ -79,9 +77,10 @@ public AbstractStringBasedJpaQuery(JpaQueryMethod method, EntityManager em, Stri
 		this.query = new ExpressionBasedStringQuery(queryString, method.getEntityInformation(), parser,
 				method.isNativeQuery());
 
-		DeclaredQuery countQuery = query.deriveCountQuery(countQueryString, method.getCountQueryProjection());
-		this.countQuery = ExpressionBasedStringQuery.from(countQuery, method.getEntityInformation(), parser,
-				method.isNativeQuery());
+		this.countQuery = Lazy.of(() -> {
+			DeclaredQuery countQuery = query.deriveCountQuery(countQueryString, method.getCountQueryProjection());
+			return ExpressionBasedStringQuery.from(countQuery, method.getEntityInformation(), parser, method.isNativeQuery());
+		});
 
 		this.parser = parser;
 		this.queryRewriter = queryRewriter;
@@ -117,7 +116,7 @@ protected ParameterBinder createBinder() {
 	@Override
 	protected Query doCreateCountQuery(JpaParametersParameterAccessor accessor) {
 
-		String queryString = countQuery.getQueryString();
+		String queryString = countQuery.get().getQueryString();
 		EntityManager em = getEntityManager();
 
 		Query query = getQueryMethod().isNativeQuery() //
@@ -142,7 +141,7 @@ public DeclaredQuery getQuery() {
 	 * @return the countQuery
 	 */
 	public DeclaredQuery getCountQuery() {
-		return countQuery;
+		return countQuery.get();
 	}
 
 	/**

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

@@ -105,7 +105,7 @@ default boolean usesPaging() {
 
 	/**
 	 * Return whether the query is a native query of not.
-	 * 
+	 *
 	 * @return <code>true</code> if native query otherwise <code>false</code>
 	 */
 	default boolean isNativeQuery() {

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

@@ -617,7 +617,7 @@ static String createCountQueryFor(String originalQuery, @Nullable String countPr
 
 			String replacement = useVariable ? SIMPLE_COUNT_VALUE : complexCountValue;
 
-			if (nativeQuery && (variable.contains(",") || "*".equals(variable))) {
+			if (variable != null && (nativeQuery && (variable.contains(",") || "*".equals(variable)))) {
 				replacement = "1";
 			} else {
 

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

@@ -70,6 +70,15 @@ void createsCountQueryForDistinctQueries() {
 				"select count(distinct u) from User u where u.foo = ?");
 	}
 
+	@Test // GH-2812
+	void createsCountQueryForDeleteQuery() {
+
+		String result = createCountQueryFor("delete from some_table where id in :ids", null, true);
+
+		// ح(•̀ж•́)ง †
+		assertThat(result).isEqualTo("deleteselect count(where) from some_table where id in :ids");
+	}
+
 	@Test
 	void createsCountQueryForConstructorQueries() {
 

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

@@ -172,6 +172,15 @@ void findsExistingOrderByIndependentOfCase() {
 		assertThat(query).endsWithIgnoringCase("ORDER BY p.firstname, p.lastname asc");
 	}
 
+	@Test // GH-2812
+	void createCountQueryFromDeleteQuery() {
+
+		StringQuery query = new StringQuery("delete from some_table where id in :ids", true);
+
+		assertThat(getEnhancer(query).createCountQueryFor("p.lastname"))
+				.isEqualToIgnoringCase("delete from some_table where id in :ids");
+	}
+
 	@Test // DATAJPA-456
 	void createCountQueryFromTheGivenCountProjection() {