Merge pull request #1289 from grails/updateUniqueConstraint

Update tests and UniqueConstraint

Author: jameskleeh

grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tests/BuiltinUniqueConstraintWorksWithTargetProxiesConstraintsSpec.groovy

@@ -7,7 +7,7 @@ class BuiltinUniqueConstraintWorksWithTargetProxiesConstraintsSpec extends GormD
 
     void "test unique constraint on root instance"() {
 
-        given:
+        setup:
         ContactDetails contactDetails1 = new ContactDetails(phoneNumber: "+1-202-555-0105").save(failOnError: true)
         ContactDetails contactDetails2 = new ContactDetails(phoneNumber: "+1-202-555-0105")
         session.flush()
@@ -27,7 +27,7 @@ class BuiltinUniqueConstraintWorksWithTargetProxiesConstraintsSpec extends GormD
 
     void "test unique constraint for the associated child object"() {
 
-        given:
+        setup:
         ContactDetails contactDetails1 = new ContactDetails(phoneNumber: "+1-202-555-0105").save(failOnError: true)
         Patient patient1 = new Patient(contactDetails: contactDetails1).save(failOnError: true)
         session.flush()
@@ -49,7 +49,7 @@ class BuiltinUniqueConstraintWorksWithTargetProxiesConstraintsSpec extends GormD
 
     void "test unique constraint on the unmodified association loaded as initialized proxy"() {
 
-        given:
+        setup:
         final ProxyHandler proxyHandler = session.mappingContext.getProxyHandler()
         ContactDetails contactDetails = new ContactDetails(phoneNumber: "+1-202-555-0105").save(failOnError: true)
         Patient patient = new Patient(contactDetails: contactDetails).save(failOnError: true)

grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tests/ProxyInitializationSpec.groovy

@@ -14,7 +14,8 @@ class ProxyInitializationSpec extends GormDatastoreSpec {
 
         setup:
         final ProxyHandler proxyHandler = session.mappingContext.getProxyHandler()
-        Long patientId = new Patient(contactDetails: new ContactDetails(phoneNumber: "+1-202-555-0105")).save(failOnError: true).id
+        ContactDetails contactDetails = new ContactDetails(phoneNumber: "+1-202-555-0178").save(failOnError: true)
+        Long patientId = new Patient(contactDetails: contactDetails).save(failOnError: true).id
         session.flush()
         session.clear()
 
@@ -25,9 +26,13 @@ class ProxyInitializationSpec extends GormDatastoreSpec {
         proxyHandler.isProxy(patient.contactDetails)
 
         when:
-        patient.contactDetails.phoneNumber = "+1-202-555-0105"
+        patient.contactDetails.phoneNumber = "+1-202-555-0178"
 
         then:
         proxyHandler.isInitialized(patient.contactDetails)
+
+        cleanup:
+        Patient.deleteAll(patient)
+        ContactDetails.deleteAll(patient.contactDetails)
     }
 }

grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/validation/constraints/builtin/UniqueConstraint.groovy

@@ -141,7 +141,11 @@ class UniqueConstraint extends AbstractConstraint {
                     // We are merely verifying that the object is not transient here
                     def targetId
                     if (proxyHandler.isProxy(target)) {
-                        targetId = proxyHandler.getIdentifier(target)
+                        if (proxyHandler.isInitialized(target)) {
+                            targetId = reflector.getIdentifier(proxyHandler.unwrap(target))
+                        } else {
+                            targetId = proxyHandler.getIdentifier(target)
+                        }
                     } else {
                         targetId = reflector.getIdentifier(target)
                     }