fix for GRAILS-1704

git-svn-id: https://svn.codehaus.org/grails/trunk@5780 1cfb16fd-6d17-0410-8ff1-b7e8e1e2867d

Author: graeme

src/persistence/org/codehaus/groovy/grails/orm/hibernate/cfg/GrailsDomainBinder.java

@@ -289,6 +289,13 @@ private static void bindCollectionSecondPass(GrailsDomainClassProperty property,
         ColumnConfig cc = getColumnConfig(property);
         // Configure one-to-many
         if(collection.isOneToMany() ) {
+
+            GrailsDomainClass referenced = property.getReferencedDomainClass();
+            if(referenced != null && !referenced.isRoot()) {
+                // NOTE: Work around for http://opensource.atlassian.com/projects/hibernate/browse/HHH-2855
+                collection.setWhere(RootClass.DEFAULT_DISCRIMINATOR_COLUMN_NAME + " = '"+referenced.getFullName()+"'");
+            }
+
             OneToMany oneToMany = (OneToMany)collection.getElement();
             String associatedClassName = oneToMany.getReferencedEntityName();
 
@@ -1090,16 +1097,12 @@ protected static void createClassProperties(GrailsDomainClass domainClass, Persi
 			// if its inherited skip
 			if(currentGrailsProp.isInherited() && !isBidirectionalManyToOne(currentGrailsProp))
 				continue;
-            else if(domainClass.hasSubClasses() && (currentGrailsProp.isOneToOne() || currentGrailsProp.isManyToOne()))
-                continue;
-            /*if(currentGrailsProp.isManyToMany() && !currentGrailsProp.isOwningSide())
-				continue;*/
             if (isCompositeIdProperty(gormMapping, currentGrailsProp)) continue;
 
             if(LOG.isDebugEnabled())
 				LOG.debug("[GrailsDomainBinder] Binding persistent property [" + currentGrailsProp.getName() + "]");
 
-			Value value = null;
+			Value value;
 
 			// see if its a collection type
 			CollectionType collectionType = CollectionType.collectionTypeForClass( currentGrailsProp.getType() );

test/groovy/org/codehaus/groovy/grails/orm/hibernate/InheritanceWithAssociationsTests.groovy

@@ -0,0 +1,82 @@
+/**
+ * @author Graeme Rocher
+ */
+package org.codehaus.groovy.grails.orm.hibernate
+class InheritanceWithAssociationsTests extends AbstractGrailsHibernateTests {
+
+    protected void onSetUp() {
+        gcl.parseClass('''
+class A {
+    Long id
+    Long version
+    LinkToA link
+}
+class B {
+    Long id
+    Long version
+    LinkToB link
+}
+class Link {
+    Long id
+    Long version
+
+    static belongsTo = Root
+
+    Root root
+}
+class LinkToA extends Link {
+    Long id
+    Long version
+
+    static belongsTo = A
+    A a
+
+}
+class LinkToB {
+    Long id
+    Long version
+
+    static belongsTo = B
+    B b
+}
+class Root {
+    Long id
+    Long version
+
+    Set links
+    static hasMany = [links : Link]
+
+} 
+''')
+    }
+
+
+    void testMapping() {
+         def rootClass = ga.getDomainClass("Root")
+         def aClass = ga.getDomainClass("A")
+         def linkToAClass = ga.getDomainClass("LinkToA")
+
+         def root = rootClass.newInstance()
+         def a = aClass.newInstance()
+         def link = linkToAClass.newInstance()
+         link.a = a
+         link.root = root
+         a.link = link
+         
+         a.save()
+
+         root.addToLinks(link)
+         root.save()
+         session.flush()
+         session.clear()
+
+         root = rootClass.clazz.get(1)
+         assert root
+         assertEquals 1, root.links.size()
+
+         link = root.links.iterator().next()
+         assert link
+         assert link.a
+
+    }
+}

test/groovy/org/codehaus/groovy/grails/orm/hibernate/OneToManyWithInheritanceTests.groovy

@@ -5,9 +5,12 @@
  * Created: Sep 21, 2007
  */
 package org.codehaus.groovy.grails.orm.hibernate
+
+import org.springframework.util.Log4jConfigurer
+
 class OneToManyWithInheritanceTests extends AbstractGrailsHibernateTests {
 
-    protected void onSetUp() {
+    protected void onSetUp() {        
         gcl.parseClass('''
 class OwnerObject {
     Long id