GRAILS-6275 - named queries now support listDistinct()

Author: jeffscottbrown

src/java/org/codehaus/groovy/grails/orm/hibernate/cfg/HibernateNamedQueriesBuilder.groovy

@@ -16,7 +16,8 @@
 package org.codehaus.groovy.grails.orm.hibernate.cfg
 
 import org.codehaus.groovy.grails.orm.hibernate.metaclass.*
-import org.codehaus.groovy.grails.plugins.orm.hibernate.HibernatePluginSupport;
+import org.codehaus.groovy.grails.plugins.orm.hibernate.HibernatePluginSupport
+import org.hibernate.criterion.CriteriaSpecification
 
 /**
  * A builder that implements the ORM named queries DSL
@@ -90,24 +91,35 @@ class NamedCriteriaProxy {
 		crit()
 	}
 
-    def list(Object[] params, Closure additionalCriteriaClosure = null) {
+    private listInternal(Object[] params, Closure additionalCriteriaClosure, Boolean isDistinct) {
         def listClosure = {
             queryBuilder = delegate
-			invokeCriteriaClosure(additionalCriteriaClosure)
-			def paramsMap
-			if (params && params[-1] instanceof Map) {
-				paramsMap = params[-1]
-			}
-			if (paramsMap?.max) {
+            invokeCriteriaClosure(additionalCriteriaClosure)
+            def paramsMap
+            if (params && params[-1] instanceof Map) {
+                paramsMap = params[-1]
+            }
+            if (paramsMap?.max) {
                 maxResults(paramsMap.max)
             }
             if (paramsMap?.offset) {
                 firstResult paramsMap.offset
             }
+            if(isDistinct) {
+                resultTransformer = CriteriaSpecification.DISTINCT_ROOT_ENTITY
+            }
         }
         domainClass.clazz.withCriteria(listClosure)
     }
 
+    def list(Object[] params, Closure additionalCriteriaClosure = null) {
+        listInternal params, additionalCriteriaClosure, false
+    }
+
+    def listDistinct(Object[] params, Closure additionalCriteriaClosure = null) {
+        listInternal params, additionalCriteriaClosure, true
+    }
+
     def call(Object[] params) {
 		if(params && params[-1] instanceof Closure) {
 			def additionalCriteriaClosure = params[-1]

src/test/org/codehaus/groovy/grails/orm/hibernate/NamedCriteriaTests.groovy

@@ -111,6 +111,65 @@ class Publication {
         assertEquals 'leafy', results[0].name
 	}
 
+    void testListDistinct() {
+        def plantCategoryClass = ga.getDomainClass("PlantCategory").clazz
+
+        assert plantCategoryClass.newInstance(name:"leafy")
+                       .addToPlants(goesInPatch:true, name:"lettuce")
+                       .addToPlants(goesInPatch:true, name:"cabbage")
+                       .save(flush:true)
+
+        assert plantCategoryClass.newInstance(name:"orange")
+                       .addToPlants(goesInPatch:true, name:"carrots")
+                       .addToPlants(goesInPatch:true, name:"pumpkin")
+                       .save(flush:true)
+
+        assert plantCategoryClass.newInstance(name:"grapes")
+                       .addToPlants(goesInPatch:false, name:"red")
+                       .addToPlants(goesInPatch:false, name:"white")
+                       .save(flush:true)
+
+        session.clear()
+
+        def categories = plantCategoryClass.withPlantsInPatch().listDistinct()
+        
+        assertEquals 2, categories.size()
+        def names = categories*.name
+        assertEquals 2, names.size()
+        assertTrue 'leafy' in names
+        assertTrue 'orange' in names
+    }
+    
+    void testListDistinct2() {
+        def plantCategoryClass = ga.getDomainClass("PlantCategory").clazz
+
+        assert plantCategoryClass.newInstance(name:"leafy")
+                       .addToPlants(goesInPatch:true, name:"lettuce")
+                       .addToPlants(goesInPatch:true, name:"cabbage")
+                       .save(flush:true)
+
+        assert plantCategoryClass.newInstance(name:"orange")
+                       .addToPlants(goesInPatch:true, name:"carrots")
+                       .addToPlants(goesInPatch:true, name:"pumpkin")
+                       .save(flush:true)
+
+        assert plantCategoryClass.newInstance(name:"grapes")
+                       .addToPlants(goesInPatch:false, name:"red")
+                       .addToPlants(goesInPatch:true, name:"white")
+                       .save(flush:true)
+
+        session.clear()
+
+        def categories = plantCategoryClass.withPlantsInPatch.listDistinct()
+
+        assertEquals 3, categories.size()
+        def names = categories*.name
+        assertEquals 3, names.size()
+        assertTrue 'leafy' in names
+        assertTrue 'orange' in names
+        assertTrue 'grapes' in names
+    }
+	
 	void testFindAllWhereAttachedToChainedNamedQueries() {
 		def publicationClass = ga.getDomainClass("Publication").clazz
 		def now = new Date()