fix for GRAILS-2015

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

Author: graeme

src/groovy/org/codehaus/groovy/grails/orm/hibernate/cfg/ColumnConfig.groovy

@@ -33,7 +33,7 @@ class ColumnConfig {
     int precision = -1
     int scale = -1
     CacheConfig cache
-    JoinTable joinTable
+    JoinTable joinTable = new JoinTable()
 
     String toString() {
         "column[name:$name, type:$type, index:$index, lazy:$lazy, unique:$unique, length:$length, precision:$precision, scale:$scale]"

src/groovy/org/codehaus/groovy/grails/orm/hibernate/cfg/HibernateMappingBuilder.groovy

@@ -239,6 +239,9 @@ class HibernateMappingBuilder {
                 }
                 column.joinTable = join
             }
+            else if(namedArgs.containsKey('joinTable') && namedArgs.joinTable == false) {
+                column.joinTable = null
+            }
 
             mapping.columns[name] = column
         }

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

@@ -428,7 +428,10 @@ private static void bindCollectionWithJoinTable(GrailsDomainClassProperty proper
     }
 
     private static boolean shouldCollectionBindWithJoinColumn(GrailsDomainClassProperty property) {
-        return isUnidirectionalOneToMany(property);
+        ColumnConfig cc = getColumnConfig(property);
+        JoinTable jt = cc != null ? cc.getJoinTable() : new JoinTable();
+        
+        return isUnidirectionalOneToMany(property) && jt!=null;
     }
 
 
@@ -818,7 +821,7 @@ private static void evaluateMapping(GrailsDomainClass domainClass) {
      * @return A Mapping object or null
      */
     public static Mapping getMapping(String domainClassName) {
-        return (Mapping)MAPPING_CACHE.get(domainClassName);
+        return (Mapping) MAPPING_CACHE.get(domainClassName);
     }
 
     /**
@@ -1703,8 +1706,13 @@ private static void bindColumn(GrailsDomainClassProperty grailsProp, Column colu
 
                 }
             }
-            column.setNullable(true);
-		} else {
+            if(grailsProp.isManyToMany())
+                column.setNullable(false);
+            else {
+
+                column.setNullable(grailsProp.isOptional());
+            }
+        } else {
             String columnName = getColumnNameForPropertyAndPath(grailsProp, path);
             column.setName(columnName);
 			column.setNullable(grailsProp.isOptional());

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

@@ -27,6 +27,10 @@ class Stockpile
   String product
   Float quantity
   StockLocation stockLocation
+
+    static constraints = {
+        stockLocation(nullable:true)
+    }
 }
 '''
     }

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

@@ -18,8 +18,8 @@ class CustomCascadeMappingOne {
     static hasMany = [foos:CustomCascadeMappingTwo, bars:CustomCascadeMappingTwo]
 
     static mapping = {
-        foos cascade:'none'
-        bars cascade:'all'
+        foos cascade:'none', joinTable:'foos'
+        bars cascade:'all', joinTable:'bars'
     }
 }
 

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

@@ -23,6 +23,10 @@ class Link {
     static belongsTo = Root
 
     Root root
+
+    static constraints = {
+        root(nullable:true)
+    }
 }
 class LinkToA extends Link {
     Long id

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

@@ -40,6 +40,10 @@ class Route {
 	
 	Airport airport
 	Airport destination
+
+    static constraints = {
+        airport nullable:true
+    }
 }
 '''
 		)

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

@@ -35,8 +35,7 @@ class SavePersistentMethodTests extends AbstractGrailsHibernateTests {
 
         book.title = "Foo"
 
-        assert !book.save()
-        assert !book.save(deepValidate:false)
+        assert book.save()
 
         def author = authorClass.newInstance()        
         author.name = "Bar"
@@ -75,8 +74,8 @@ class SavePersistentMethodTests extends AbstractGrailsHibernateTests {
         assert !author.save()
         author.name = "Foo"
 
-        assert !author.save()
-        assert !author.save(deepValidate:false)
+        assert author.save()
+
 
         def address = addressClass.newInstance()
         author.address = address
@@ -109,7 +108,7 @@ class SaveBook {
     static belongsTo = SaveAuthor
     static constraints = {
        title(blank:false, size:1..255)
-       author(nullable:false)
+       author(nullable:true)
     }
 }
 class SaveAuthor {
@@ -120,7 +119,7 @@ class SaveAuthor {
    Set books = new HashSet()
    static hasMany = [books:SaveBook]
    static constraints = {
-        address(nullable:false)
+        address(nullable:true)
         name(size:1..255, blank:false)
    }
 }
@@ -131,7 +130,7 @@ class SaveAddress {
     String location
     static belongsTo = SaveAuthor
     static constraints = {
-       author(nullable:false)
+       author(nullable:true)
        location(blank:false)
     }
 }