Fetch HQL from Hibernate using a different API.

See #3085
spring-projects · Sep 7, 2023 · 5780245 · mp911de · Sep 8, 2023 · 5780245
1 parent 778b481
commit 5780245
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/spring-data-jpa/src/main/java/org/springframework/data/jpa/provider/HibernateUtils.java b/spring-data-jpa/src/main/java/org/springframework/data/jpa/provider/HibernateUtils.java
@@ -48,7 +48,16 @@ public static String getHibernateQuery(Object query) {
 
  // Try the new Hibernate implementation first
  if (query instanceof SqmQuery sqmQuery) {
- return sqmQuery.getSqmStatement().toHqlString();
+
+ String hql = sqmQuery.getQueryString();
+
+ if (!hql.equals("<criteria>")) {
+ return hql;
+ }
+
+ String sqmHql = sqmQuery.getSqmStatement().toHqlString();
+
+ return sqmHql;
  }
 
  // Couple of cases in which this still breaks, see HHH-15389