From 84e0e323f7796dbcc1e6d77dd101d22b3130eba9 Mon Sep 17 00:00:00 2001 From: Christoph Strobl Date: Fri, 25 Oct 2024 13:35:13 +0200 Subject: [PATCH] Fix NPE when parsing modifying HQL. Closes #3649 Original pull request: #3650 --- .../repository/query/HqlQueryTransformer.java | 6 ++++- .../query/HqlQueryTransformerTests.java | 25 ++++++++++++------- 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/HqlQueryTransformer.java b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/HqlQueryTransformer.java index dc0445263..4c7a7e359 100644 --- a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/HqlQueryTransformer.java +++ b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/HqlQueryTransformer.java @@ -101,8 +101,12 @@ class HqlQueryTransformer extends HqlQueryRenderer { return false; } else if (ctx instanceof HqlParser.InsertStatementContext) { return false; + } else if (ctx instanceof HqlParser.DeleteStatementContext) { + return false; + } else if (ctx instanceof HqlParser.UpdateStatementContext) { + return false; } else { - return isSubquery(ctx.getParent()); + return ctx.getParent() != null ? isSubquery(ctx.getParent()) : false; } } diff --git a/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/HqlQueryTransformerTests.java b/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/HqlQueryTransformerTests.java index 648c03e05..5dab8c1cf 100644 --- a/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/HqlQueryTransformerTests.java +++ b/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/HqlQueryTransformerTests.java @@ -995,16 +995,23 @@ class HqlQueryTransformerTests { .isEqualTo("FROM Story WHERE enabled = true order by created desc"); } - @Test // GH-2977 - void isSubqueryThrowsException() { - - String query = """ - insert into MyEntity (id, col) - select max(id), col - from MyEntityStaging - group by col - """; + @ParameterizedTest + @ValueSource(strings = { """ + insert into MyEntity (id, col) + select max(id), col + from MyEntityStaging + group by col + """, """ + update MyEntity AS mes + set mes.col = 'test' + where mes.id = 1 + """, """ + delete MyEntity AS mes + where mes.col = 'test' + """ + }) // GH-2977, GH-3649 + void isSubqueryThrowsException(String query) { assertThat(createQueryFor(query, Sort.unsorted())).isEqualToIgnoringWhitespace(query); }