GRAILS-2375: adding insertable false hibernate mapping will add nullable true constraint

Author: vincentrussell

src/java/org/codehaus/groovy/grails/commons/GrailsDomainConfigurationUtil.java

@@ -396,7 +396,7 @@ public static Map<String, ConstrainedProperty> evaluateConstraints(final Class<?
                     // specified otherwise by the constraints
                     // If the field is a Java entity annotated with @Entity skip this
                     applyDefaultConstraints(propertyName, p, cp,
-                            defaultConstraints, delegate.getSharedConstraint(propertyName));
+                            defaultConstraints, delegate.getSharedConstraint(propertyName), propertyConfig);
                 }
             }
         }
@@ -451,7 +451,7 @@ public static Map<String, ConstrainedProperty> evaluateConstraints(Class<?> theC
 
     @SuppressWarnings("unchecked")
     private static void applyDefaultConstraints(String propertyName, GrailsDomainClassProperty p,
-            ConstrainedProperty cp, Map<String, Object> defaultConstraints, String sharedConstraintReference) {
+            ConstrainedProperty cp, Map<String, Object> defaultConstraints, String sharedConstraintReference, PropertyConfig propertyConfig) {
 
         if (defaultConstraints != null && !defaultConstraints.isEmpty()) {
             if (defaultConstraints.containsKey("*")) {
@@ -473,10 +473,14 @@ private static void applyDefaultConstraints(String propertyName, GrailsDomainCla
         }
 
         if (canApplyNullableConstraint(propertyName, p, cp)) {
-            cp.applyConstraint(ConstrainedProperty.NULLABLE_CONSTRAINT,
-                    Collection.class.isAssignableFrom(p.getType()) ||
-                    Map.class.isAssignableFrom(p.getType())
-            );
+            if (propertyConfig!=null && !propertyConfig.getInsertable()) {
+                cp.applyConstraint(ConstrainedProperty.NULLABLE_CONSTRAINT,true);
+            } else {
+                cp.applyConstraint(ConstrainedProperty.NULLABLE_CONSTRAINT,
+                        Collection.class.isAssignableFrom(p.getType()) ||
+                        Map.class.isAssignableFrom(p.getType())
+                );
+            }
         }
     }
 

src/test/org/codehaus/groovy/grails/commons/GrailsDomainConfigurationUtilTests.java

@@ -17,8 +17,16 @@
 import junit.framework.TestCase;
 
 import java.util.Date;
+import java.util.Map;
 import java.net.URL;
 import java.net.URI;
+import org.codehaus.groovy.grails.orm.hibernate.cfg.DefaultGrailsDomainConfiguration;
+import org.codehaus.groovy.grails.orm.hibernate.cfg.GrailsDomainBinder;
+import org.hibernate.cfg.ImprovedNamingStrategy;
+import org.codehaus.groovy.grails.validation.ConstrainedProperty;
+import org.codehaus.groovy.grails.validation.NullableConstraint;
+import groovy.lang.ExpandoMetaClass;
+import groovy.lang.GroovyClassLoader;
 
 /**
  * Tests for the GrailsDomainConfigurationUtil class
@@ -32,6 +40,18 @@
  */
 public class GrailsDomainConfigurationUtilTests extends TestCase {
 
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        ExpandoMetaClass.enableGlobally();
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        super.tearDown();
+        GrailsDomainBinder.namingStrategy = ImprovedNamingStrategy.INSTANCE;
+    }
+
     public void testIsBasicType() {
         assertTrue(GrailsDomainConfigurationUtil.isBasicType(boolean.class));
         assertTrue(GrailsDomainConfigurationUtil.isBasicType(long.class));
@@ -67,6 +87,42 @@ public void testIsBasicType() {
         assertTrue(GrailsDomainConfigurationUtil.isBasicType(Character[].class));
         assertTrue(GrailsDomainConfigurationUtil.isBasicType(Double[].class));
         assertTrue(GrailsDomainConfigurationUtil.isBasicType(Float[].class));
-        assertTrue(GrailsDomainConfigurationUtil.isBasicType(Byte[].class));        
+        assertTrue(GrailsDomainConfigurationUtil.isBasicType(Byte[].class));
+    }
+
+    public void testEvaluateConstraintsInsertableShouldBeNullableByDefault() {
+        GroovyClassLoader cl = new GroovyClassLoader();
+        GrailsDomainClass domainClass = new DefaultGrailsDomainClass(
+            cl.parseClass(
+                "class TestInsertableUpdateableDomain {\n" +
+                "    Long id \n" +
+                "    Long version \n" +
+                "    String testString1 \n" +
+                "    String testString2 \n"+
+                "\n" +
+                "    static mapping = {\n" +
+                "       testString1 insertable:false \n" +
+                "       testString2 max:50 \n" +
+                "    }\n" +
+                "}")
+        );
+
+       DefaultGrailsDomainConfiguration config = getDomainConfig(cl,
+                new Class[] { domainClass.getClazz() });
+        Map<String, ConstrainedProperty> mapping = GrailsDomainConfigurationUtil.evaluateConstraints(domainClass.getClazz(),domainClass.getProperties(),null);
+        ConstrainedProperty property1 = mapping.get("testString1");
+        assertTrue("constraint was not nullable and should be", ((NullableConstraint)property1.getAppliedConstraint(ConstrainedProperty.NULLABLE_CONSTRAINT)).isNullable());
+        ConstrainedProperty property2 = mapping.get("testString2");
+        assertFalse("constraint was nullable and shouldn't be", ((NullableConstraint)property2.getAppliedConstraint(ConstrainedProperty.NULLABLE_CONSTRAINT)).isNullable());
+
+    }
+
+    private DefaultGrailsDomainConfiguration getDomainConfig(GroovyClassLoader cl, Class<?>[] classes) {
+        GrailsApplication grailsApplication = new DefaultGrailsApplication(classes, cl);
+        grailsApplication.initialise();
+        DefaultGrailsDomainConfiguration config = new DefaultGrailsDomainConfiguration();
+        config.setGrailsApplication(grailsApplication);
+        config.buildMappings();
+        return config;
     }
 }