trying to fix edge cases

Author: borinquenkid

grails-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/query/AbstractHibernateQuery.java

@@ -30,6 +30,7 @@
 import org.grails.datastore.mapping.model.types.Association;
 import org.grails.datastore.mapping.query.AssociationQuery;
 import org.grails.datastore.mapping.query.Query;
+import org.grails.datastore.mapping.query.QueryException;
 import org.grails.datastore.mapping.query.Restrictions;
 import org.grails.datastore.mapping.query.api.QueryableCriteria;
 import org.grails.orm.hibernate.AbstractHibernateSession;
@@ -48,6 +49,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Function;
 import java.util.function.Predicate;
@@ -184,6 +186,9 @@ public void add(Criterion criterion) {
             le(c.getProperty(),c.getValue());
         } else if (criterion instanceof LessThan c) {
             lt(c.getProperty(),c.getValue());
+        } else {
+            //TODO It could be that this is the only call needed!
+            detachedCriteria.add(criterion);
         }
     }
 
@@ -448,12 +453,14 @@ private static <T> Predicate<T> combinePredicates(Predicate<T>... predicates) {
 
     protected org.hibernate.query.Query createQuery() {
         HibernateCriteriaBuilder cb = getCriteriaBuilder();
+
+
         List<DetachedAssociationCriteria> detachedAssociationCriteria = getDetachedAssociationCriteria();
 
         Map<String, DetachedAssociationCriteria> aliasMap = detachedAssociationCriteria.stream()
                 .collect(Collectors.toMap(
                         DetachedAssociationCriteria::getAssociationPath,
-                    criteria ->criteria)
+                    criteria ->criteria, (oldValue,newValue) -> newValue)
                 );
 
 
@@ -469,7 +476,7 @@ protected org.hibernate.query.Query createQuery() {
         Map<String, From> fromMap = detachedAssociationCriteria.stream()
                 .collect(Collectors.toMap(
                         DetachedAssociationCriteria::getAssociationPath,
-                        criteria -> cq.from(criteria.getAssociation().getOwner().getJavaClass()))
+                        criteria -> cq.from(criteria.getAssociation().getOwner().getJavaClass()) , (oldValue,newValue) -> newValue)
                 );
         fromMap.put("root", root);
         Map<String, From> tablesByName = assignJoinTables(joinColumns, root,aliasMap, fromMap);
@@ -627,7 +634,7 @@ private Map<String, From> assignJoinTables(List<String> joinColumns, From root,
     private static String aliasColumn(Map<String, DetachedAssociationCriteria> aliasMap, String associationPath, Join table) {
         String column = associationPath;
         if (aliasMap.containsKey(associationPath)) {
-            column = aliasMap.get(associationPath).getAlias();
+            column = Optional.ofNullable(aliasMap.get(associationPath).getAlias()).orElseThrow(() -> new QueryException("Association without alias"));
             table.alias(column);
         }
         return column;

grails-datastore-gorm-hibernate/src/main/groovy/org/grails/orm/hibernate/query/PredicateGenerator.java

@@ -6,6 +6,7 @@
 import jakarta.persistence.criteria.Predicate;
 import jakarta.persistence.criteria.Root;
 import jakarta.persistence.criteria.Subquery;
+import org.grails.datastore.gorm.query.criteria.DetachedAssociationCriteria;
 import org.grails.datastore.mapping.query.Query;
 import org.hibernate.query.criteria.HibernateCriteriaBuilder;
 import org.hibernate.query.criteria.JpaInPredicate;
@@ -45,6 +46,9 @@ public static Predicate[] getPredicates(HibernateCriteriaBuilder cb,
                     } else if (criterion instanceof Query.Conjunction) {
                         List<Query.Criterion> criterionList = ((Query.Conjunction) criterion).getCriteria();
                         return cb.and(getPredicates(cb, criteriaQuery, root_, criterionList, tablesByName));
+                    } else if (criterion instanceof DetachedAssociationCriteria<?> c) {
+                            List<Query.Criterion> criterionList = c.getCriteria();
+                            return cb.and(getPredicates(cb, criteriaQuery, root_, criterionList, tablesByName));
                     } else if (criterion instanceof Query.Negation) {
                         List<Query.Criterion> criterionList = ((Query.Negation) criterion).getCriteria();
                         Predicate[] predicates = getPredicates(cb, criteriaQuery, root_, criterionList, tablesByName);

grails-datastore-gorm-hibernate/src/test/groovy/grails/gorm/specs/TablePerSubClassAndEmbeddedSpec.groovy

@@ -16,10 +16,13 @@ import spock.lang.Specification
  * Created by graemerocher on 04/11/16.
  */
 @ApplyDetachedCriteriaTransform
-class TablePerSubClassAndEmbeddedSpec extends Specification {
+class TablePerSubClassAndEmbeddedSpec extends HibernateGormDatastoreSpec {
+
+    @Override
+    List getDomainClasses() {
+        [Company, Vendor]
+    }
 
-    @Shared @AutoCleanup HibernateDatastore hibernateDatastore = new HibernateDatastore(Company, Vendor)
-    @Shared PlatformTransactionManager transactionManager = hibernateDatastore.getTransactionManager()
 
     @Rollback
     void 'test table per subclass with embedded entity'() {

grails-datastore-gorm-hibernate/src/test/groovy/grails/gorm/specs/WhereQueryWithAssociationSortSpec.groovy

@@ -1,13 +1,13 @@
 package grails.gorm.specs
 
 import grails.gorm.tests.GormDatastoreSpec
-import org.hibernate.QueryException
+import org.grails.datastore.mapping.query.QueryException
 import spock.lang.Issue
 
 /**
  * Created by graemerocher on 03/11/16.
  */
-class WhereQueryWithAssociationSortSpec extends GormDatastoreSpec {
+class WhereQueryWithAssociationSortSpec extends HibernateGormDatastoreSpec {
 
     @Issue('https://github.com/grails/grails-core/issues/9860')
     void "Test sort with where query that queries association"() {
@@ -28,10 +28,12 @@ class WhereQueryWithAssociationSortSpec extends GormDatastoreSpec {
 
 
         when:"a where query uses a sort on an association"
-        results = Team.where {
+
+        def where = Team.where {
             def c1 = club
             c1.name ==~ '%e%'
-        }.list(sort:'c1.name')
+        }
+       results = where.list(sort:'c1.name')
 
 
         then:"an exception is thrown because no alias is specified"