Skip to content

Use rewritten EntityQuery for query validation to ensure normalization #4038

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Use rewritten EntityQuery for query validation to ensure normalization #4038

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions ...-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/SimpleJpaQuery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

import org.jspecify.annotations.Nullable;

import org.springframework.data.domain.Sort;
import org.springframework.data.repository.query.QueryCreationException;
import org.springframework.data.repository.query.RepositoryQuery;

Expand All @@ -32,6 +33,7 @@
* @author Thomas Darimont
* @author Mark Paluch
* @author Greg Turnquist
* @author Su Ko
*/
class SimpleJpaQuery extends AbstractStringBasedJpaQuery {

Expand Down Expand Up @@ -68,9 +70,15 @@ private void validateQuery(QueryProvider query, String errorMessage, JpaQueryMet
return;
}

String queryString = query.getQueryString();
String queryString = query.getQueryString();
if(query instanceof EntityQuery entityQuery) {
queryString = entityQuery
.rewrite(new DefaultQueryRewriteInformation(Sort.unsorted(),getReturnedType(method.getResultProcessor())))
.getQueryString();
}

try (EntityManager validatingEm = getEntityManager().getEntityManagerFactory().createEntityManager()) {
validatingEm.createQuery(queryString);
validatingEm.createQuery(potentiallyRewriteQuery(queryString, Sort.unsorted(), null));
} catch (RuntimeException e) {

// Needed as there's ambiguities in how an invalid query string shall be expressed by the persistence provider
Expand Down