diff --git a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/DeclaredQuery.java b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/DeclaredQuery.java
index 500e64d1a..4821865de 100644
--- a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/DeclaredQuery.java
+++ b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/DeclaredQuery.java
@@ -105,7 +105,7 @@ interface DeclaredQuery {
/**
* Return whether the query is a native query of not.
- *
+ *
* @return true if native query otherwise false
*/
default boolean isNativeQuery() {
diff --git a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/QueryUtils.java b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/QueryUtils.java
index 785dde580..f581f191f 100644
--- a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/QueryUtils.java
+++ b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/QueryUtils.java
@@ -617,7 +617,7 @@ public abstract class QueryUtils {
String replacement = useVariable ? SIMPLE_COUNT_VALUE : complexCountValue;
- if (nativeQuery && (variable.contains(",") || "*".equals(variable))) {
+ if (variable != null && (nativeQuery && (variable.contains(",") || "*".equals(variable)))) {
replacement = "1";
} else {
diff --git a/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/DefaultQueryUtilsUnitTests.java b/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/DefaultQueryUtilsUnitTests.java
index 89dba5b88..2409a9b2d 100644
--- a/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/DefaultQueryUtilsUnitTests.java
+++ b/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/DefaultQueryUtilsUnitTests.java
@@ -70,6 +70,15 @@ class DefaultQueryUtilsUnitTests {
"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() {
diff --git a/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/QueryEnhancerUnitTests.java b/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/QueryEnhancerUnitTests.java
index 8a88420b8..e3dcbc7ad 100644
--- a/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/QueryEnhancerUnitTests.java
+++ b/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/QueryEnhancerUnitTests.java
@@ -176,6 +176,15 @@ class QueryEnhancerUnitTests {
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() {