This is an automated email from the ASF dual-hosted git repository. borinquenkid pushed a commit to branch 8.0.x-hibernate7 in repository https://gitbox.apache.org/repos/asf/grails-core.git
commit 5acd25897bd05ff871b8679c2223daa05b878456 Author: Walter B Duque de Estrada <[email protected]> AuthorDate: Wed Jan 21 10:27:45 2026 -0600 update progress --- grails-data-hibernate7/core/HIBERNATE7-TESTS.csv | 2 +- .../groovy/org/grails/orm/hibernate/cfg/GrailsDomainBinder.java | 2 +- .../orm/hibernate/cfg/domainbinding/BasicValueIdCreator.java | 9 +++------ .../grails/orm/hibernate/cfg/domainbinding/SimpleIdBinder.java | 4 ++-- 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/grails-data-hibernate7/core/HIBERNATE7-TESTS.csv b/grails-data-hibernate7/core/HIBERNATE7-TESTS.csv index f64afb475c..392eb259b3 100644 --- a/grails-data-hibernate7/core/HIBERNATE7-TESTS.csv +++ b/grails-data-hibernate7/core/HIBERNATE7-TESTS.csv @@ -14,7 +14,7 @@ Test File , Status , Notes `TCK: org.apache.grails.data.testing.tck.tests.UpdateWithProxyPresentSpec` , FAILED , `src/test/groovy/org/grails/orm/hibernate/HibernateGormInstanceApiSpec.groovy` , FAILED , `src/test/groovy/org/grails/orm/hibernate/HibernateGormStaticApiSpec.groovy` , FAILED , -`src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/SequenceGeneratorsSpec.groovy` , FAILED , +`src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/SequenceGeneratorsSpec.groovy` , FAILED , only increment fails `src/test/groovy/org/grails/orm/hibernate/connections/MultipleDataSourceConnectionsSpec.groovy` , FAILED , `src/test/groovy/org/grails/orm/hibernate/connections/MultipleDataSourcesWithCachingSpec.groovy` , FAILED , `src/test/groovy/org/grails/orm/hibernate/connections/MultipleDataSourcesWithEventsSpec.groovy` , FAILED , diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/GrailsDomainBinder.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/GrailsDomainBinder.java index 23e5b07c8e..4a5b34d46f 100644 --- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/GrailsDomainBinder.java +++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/GrailsDomainBinder.java @@ -2009,7 +2009,7 @@ public class GrailsDomainBinder @SuppressWarnings("unchecked") private void bindSimpleId(PersistentProperty identifier, RootClass entity, InFlightMetadataCollector mappings, Identity mappedId, String sessionFactoryBeanName, HibernatePersistentEntity domainClass) { - SimpleIdBinder simpleIdBinder = new SimpleIdBinder(metadataBuildingContext,namingStrategy, getJdbcEnvironment(), domainClass); + SimpleIdBinder simpleIdBinder = new SimpleIdBinder(metadataBuildingContext,namingStrategy, getJdbcEnvironment(), domainClass,entity); simpleIdBinder.bindSimpleId(identifier, entity, mappedId); } diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/BasicValueIdCreator.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/BasicValueIdCreator.java index aa5415ce01..265a44e101 100644 --- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/BasicValueIdCreator.java +++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/BasicValueIdCreator.java @@ -20,27 +20,24 @@ import org.grails.orm.hibernate.cfg.Identity; public class BasicValueIdCreator { - private final MetadataBuildingContext metadataBuildingContext; private final JdbcEnvironment jdbcEnvironment; private HibernatePersistentEntity domainClass; private final Map<String, BiFunction<GeneratorCreationContext, Identity, Generator>> generatorFactories; @SuppressWarnings("unused") // kept for tests that want to provide a prototype BasicValue private final BasicValue id; - public BasicValueIdCreator(MetadataBuildingContext metadataBuildingContext, JdbcEnvironment jdbcEnvironment, HibernatePersistentEntity domainClass) { + public BasicValueIdCreator(MetadataBuildingContext metadataBuildingContext, JdbcEnvironment jdbcEnvironment, HibernatePersistentEntity domainClass, RootClass entity) { // create a prototype BasicValue (table will be set per-entity when creating the actual BasicValue) - this(metadataBuildingContext, jdbcEnvironment, new BasicValue(metadataBuildingContext, null), new HashMap<>()); + this(jdbcEnvironment, new BasicValue(metadataBuildingContext, entity.getTable()), new HashMap<>()); this.domainClass = domainClass; initializeGeneratorFactories(); } - protected BasicValueIdCreator(MetadataBuildingContext metadataBuildingContext - , JdbcEnvironment jdbcEnvironment + protected BasicValueIdCreator(JdbcEnvironment jdbcEnvironment , BasicValue prototypeBasicValue , Map<String, BiFunction<GeneratorCreationContext , Identity , Generator>> generatorFactories) { - this.metadataBuildingContext = metadataBuildingContext; this.generatorFactories = generatorFactories; this.jdbcEnvironment = jdbcEnvironment; this.id = prototypeBasicValue; diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/SimpleIdBinder.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/SimpleIdBinder.java index 17b3b26b4b..f5c4b50b07 100644 --- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/SimpleIdBinder.java +++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/SimpleIdBinder.java @@ -22,8 +22,8 @@ public class SimpleIdBinder { private final SimpleValueBinder simpleValueBinder; private final PropertyBinder propertyBinder; - public SimpleIdBinder(MetadataBuildingContext metadataBuildingContext, PersistentEntityNamingStrategy namingStrategy, JdbcEnvironment jdbcEnvironment, HibernatePersistentEntity domainClass) { - this.basicValueIdCreator = new BasicValueIdCreator(metadataBuildingContext, jdbcEnvironment, domainClass); + public SimpleIdBinder(MetadataBuildingContext metadataBuildingContext, PersistentEntityNamingStrategy namingStrategy, JdbcEnvironment jdbcEnvironment, HibernatePersistentEntity domainClass, RootClass entity) { + this.basicValueIdCreator = new BasicValueIdCreator(metadataBuildingContext, jdbcEnvironment, domainClass, entity); this.hibernateEntityWrapper = new HibernateEntityWrapper(); this.simpleValueBinder =new SimpleValueBinder(namingStrategy); this.propertyBinder = new PropertyBinder();
