This is an automated email from the ASF dual-hosted git repository. borinquenkid pushed a commit to branch merge-hibernate6 in repository https://gitbox.apache.org/repos/asf/grails-core.git
commit fc6fb2773089edc65a8d211e7db893b75d7b53a1 Author: Walter Duque de Estrada <[email protected]> AuthorDate: Wed May 21 22:50:28 2025 -0500 working on Composite keys with Cascade not saving correctly --- .../main/groovy/org/grails/orm/hibernate/cfg/GrailsDomainBinder.java | 3 +++ .../core/src/test/resources/simplelogger.properties | 5 +++-- .../main/groovy/org/grails/orm/hibernate/cfg/GrailsDomainBinder.java | 3 +++ .../test/groovy/grails/gorm/specs/HibernateGormDatastoreSpec.groovy | 2 +- .../specs/compositeid/CompositeIdWithDeepOneToManyMappingSpec.groovy | 1 + .../core/src/test/resources/simplelogger.properties | 4 +++- 6 files changed, 14 insertions(+), 4 deletions(-) diff --git a/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/cfg/GrailsDomainBinder.java b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/cfg/GrailsDomainBinder.java index cbfbedcb26..accec50d97 100644 --- a/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/cfg/GrailsDomainBinder.java +++ b/grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/cfg/GrailsDomainBinder.java @@ -2737,6 +2737,7 @@ public class GrailsDomainBinder implements MetadataContributor { PropertyConfig config = getPropertyConfig(grailsProperty); if (config != null && config.getCascade() != null) { cascadeStrategy = config.getCascade(); + LOG.debug("Cascade strategy for property ${grailsProperty.getName()} is ${cascadeStrategy}"); } else if (grailsProperty instanceof Association) { Association association = (Association) grailsProperty; PersistentEntity referenced = association.getAssociatedEntity(); @@ -2784,6 +2785,8 @@ public class GrailsDomainBinder implements MetadataContributor { } } logCascadeMapping(association, cascadeStrategy, referenced); + } else { + LOG.debug("No cascade strategy for property: " + grailsProperty); } prop.setCascade(cascadeStrategy); } diff --git a/grails-data-hibernate5/core/src/test/resources/simplelogger.properties b/grails-data-hibernate5/core/src/test/resources/simplelogger.properties index 2f5ac2062a..40b1080c6e 100644 --- a/grails-data-hibernate5/core/src/test/resources/simplelogger.properties +++ b/grails-data-hibernate5/core/src/test/resources/simplelogger.properties @@ -18,5 +18,6 @@ # #org.slf4j.simpleLogger.defaultLogLevel=debug -#org.slf4j.simpleLogger.log.org.hibernate=trace -#org.slf4j.simpleLogger.log.org.hibernate.SQL=debug \ No newline at end of file +org.slf4j.simpleLogger.log.org.hibernate=trace +org.slf4j.simpleLogger.log.org.hibernate.SQL=debug +org.slf4j.simpleLogger.log.org.grails.orm.hibernate.cfg=debug \ No newline at end of file diff --git a/grails-data-hibernate6/core/src/main/groovy/org/grails/orm/hibernate/cfg/GrailsDomainBinder.java b/grails-data-hibernate6/core/src/main/groovy/org/grails/orm/hibernate/cfg/GrailsDomainBinder.java index b100b5a21b..35c8823882 100644 --- a/grails-data-hibernate6/core/src/main/groovy/org/grails/orm/hibernate/cfg/GrailsDomainBinder.java +++ b/grails-data-hibernate6/core/src/main/groovy/org/grails/orm/hibernate/cfg/GrailsDomainBinder.java @@ -2744,6 +2744,7 @@ public class GrailsDomainBinder implements MetadataContributor { PropertyConfig config = getPropertyConfig(grailsProperty); if (config != null && config.getCascade() != null) { cascadeStrategy = config.getCascade(); + LOG.debug("Cascade strategy for property ${grailsProperty.getName()} is ${cascadeStrategy}"); } else if (grailsProperty instanceof Association) { Association association = (Association) grailsProperty; PersistentEntity referenced = association.getAssociatedEntity(); @@ -2791,6 +2792,8 @@ public class GrailsDomainBinder implements MetadataContributor { } } logCascadeMapping(association, cascadeStrategy, referenced); + } else { + LOG.debug("No cascade strategy for property: " + grailsProperty); } prop.setCascade(cascadeStrategy); } diff --git a/grails-data-hibernate6/core/src/test/groovy/grails/gorm/specs/HibernateGormDatastoreSpec.groovy b/grails-data-hibernate6/core/src/test/groovy/grails/gorm/specs/HibernateGormDatastoreSpec.groovy index 80cecfb644..8a2d9e5434 100644 --- a/grails-data-hibernate6/core/src/test/groovy/grails/gorm/specs/HibernateGormDatastoreSpec.groovy +++ b/grails-data-hibernate6/core/src/test/groovy/grails/gorm/specs/HibernateGormDatastoreSpec.groovy @@ -20,7 +20,7 @@ class HibernateGormDatastoreSpec extends GrailsDataTckSpec<GrailsDataHibernate6T def setupSpec() { manager.grailsConfig = [ - 'dataSource.url' : "jdbc:tc:postgresql:latest:///dev_db", + 'dataSource.url' : "jdbc:h2:mem:grailsDB;LOCK_TIMEOUT=10000", 'dataSource.dbCreate' : 'create-drop', 'dataSource.formatSql' : 'true', 'dataSource.logSql' : 'true', diff --git a/grails-data-hibernate6/core/src/test/groovy/grails/gorm/specs/compositeid/CompositeIdWithDeepOneToManyMappingSpec.groovy b/grails-data-hibernate6/core/src/test/groovy/grails/gorm/specs/compositeid/CompositeIdWithDeepOneToManyMappingSpec.groovy index ea2bec8867..d5e47aac0e 100644 --- a/grails-data-hibernate6/core/src/test/groovy/grails/gorm/specs/compositeid/CompositeIdWithDeepOneToManyMappingSpec.groovy +++ b/grails-data-hibernate6/core/src/test/groovy/grails/gorm/specs/compositeid/CompositeIdWithDeepOneToManyMappingSpec.groovy @@ -34,6 +34,7 @@ class CompositeIdWithDeepOneToManyMappingSpec extends HibernateGormDatastoreSpec @Override def setupSpec() { + manager.domainClasses.clear() manager.domainClasses.addAll([GrandParent, Parent, Child]) } diff --git a/grails-data-hibernate6/core/src/test/resources/simplelogger.properties b/grails-data-hibernate6/core/src/test/resources/simplelogger.properties index b6c41c0567..d39a4c64a3 100644 --- a/grails-data-hibernate6/core/src/test/resources/simplelogger.properties +++ b/grails-data-hibernate6/core/src/test/resources/simplelogger.properties @@ -1,3 +1,5 @@ #org.slf4j.simpleLogger.defaultLogLevel=trace #org.slf4j.simpleLogger.log.org.hibernate=trace -org.slf4j.simpleLogger.log.org.hibernate.SQL=debug \ No newline at end of file +org.slf4j.simpleLogger.log.org.grails.orm.hibernate=trace +org.slf4j.simpleLogger.log.org.hibernate.SQL=debug +org.slf4j.simpleLogger.log.org.grails.orm.hibernate.cfg=debug \ No newline at end of file
