Fix NullPointer when deriving a count query for non-SELECT statements.

Closes #2812

Author: mp911de

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

@@ -176,6 +176,15 @@ void findsExistingOrderByIndependentOfCase() {
 		endsIgnoringCase(query, "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() {