related to GRAILS-6140. fix problem related to nested named queries. the problem prevented relationships from being part of the criteria inside of a named query. fixed here.

Author: jeffscottbrown

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

@@ -181,7 +181,8 @@ class NamedCriteriaProxy {
         	def nextInChain = domainClass.metaClass.getMetaProperty(methodName).getProperty(domainClass)
 			nextInChain.previousInChain = this
 		    return nextInChain(args)
-        } else if (domainClass.metaClass.getMetaProperty(methodName)) {
+        } else if (domainClass.metaClass.getMetaProperty(methodName) &&
+                   !Collection.isAssignableFrom(domainClass.metaClass.getMetaProperty(methodName).type)) {
         	def nestedCriteria = domainClass.metaClass.getMetaProperty(methodName).getProperty(domainClass).criteriaClosure.clone()
             nestedCriteria.delegate = queryBuilder
             nestedCriteria(*args)

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

@@ -7,6 +7,29 @@ class NamedCriteriaTests extends AbstractGrailsHibernateTests {
 
     protected void onSetUp() {
         gcl.parseClass('''
+class PlantCategory {
+    Long id
+    Long version
+    Set plants
+    String name
+
+    static hasMany = [plants:Plant]
+                                
+    static namedQueries = {
+        withPlantsInPatch {
+            plants {
+                eq 'goesInPatch', true
+            }
+        }
+    }
+}
+
+class Plant {
+    Long id
+    Long version
+    boolean goesInPatch
+    String name
+}
 
 class Publication {
    Long id
@@ -70,6 +93,23 @@ class Publication {
 ''')
     }
 
+	void testNamedQueryWithRelationshipInCriteria() {
+        def plantCategoryClass = ga.getDomainClass("PlantCategory").clazz
+
+        assert plantCategoryClass.newInstance(name:"leafy")
+                       .addToPlants(goesInPatch:true, name:"lettuce")
+                       .save(flush:true)
+
+        assert plantCategoryClass.newInstance(name:"grapes")
+                       .addToPlants(goesInPatch:false, name:"white")
+                       .save(flush:true)
+
+        session.clear()
+
+        def results = plantCategoryClass.withPlantsInPatch.list()
+        assertEquals 1, results.size()
+        assertEquals 'leafy', results[0].name
+	}
 
 	void testFindAllWhereAttachedToChainedNamedQueries() {
 		def publicationClass = ga.getDomainClass("Publication").clazz