You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@grails.apache.org by bo...@apache.org on 2026/02/09 03:38:41 UTC
(grails-core) 06/20: progress
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 0dd53ae0cd4b5368720c398ca654941751381bf3
Author: Walter Duque de Estrada <wb...@mac.com>
AuthorDate: Fri Feb 6 20:35:00 2026 -0600
progress
---
.../grails/orm/hibernate/cfg/GrailsDomainBinder.java | 19 +++++++++++++++----
.../hibernate/cfg/domainbinding/CollectionBinder.java | 15 +--------------
2 files changed, 16 insertions(+), 18 deletions(-)
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 1ee42fff8c..fb810a11dc 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
@@ -45,6 +45,7 @@ import org.hibernate.engine.spi.FilterDefinition;
import org.hibernate.mapping.BasicValue;
import org.hibernate.mapping.Collection;
import org.hibernate.mapping.Column;
+import org.hibernate.mapping.Component;
import org.hibernate.mapping.DependantValue;
import org.hibernate.mapping.Formula;
import org.hibernate.mapping.JoinedSubclass;
@@ -309,9 +310,7 @@ public class GrailsDomainBinder
mappings.addEntityBinding(root);
}
- public String getMultiTenantFilterCondition(PersistentEntity referenced) {
- return collectionBinder.getMultiTenantFilterCondition(referenced);
- }
+
public PersistentEntityNamingStrategy getNamingStrategy() {
if (namingStrategy == null) {
@@ -345,7 +344,7 @@ public class GrailsDomainBinder
Collections.emptyMap()
);
- Property property = collectionBinder.getProperty(persistentClass, tenantId.getName());
+ Property property = collectionBinder.grailsDomainBinder.getProperty(persistentClass, tenantId.getName());
if (property.getValue() instanceof BasicValue basicValue) {
JdbcMapping jdbcMapping = basicValue.resolve().getJdbcMapping();
var stringVMap = Collections.singletonMap(GormProperties.TENANT_IDENTITY, jdbcMapping);
@@ -714,4 +713,16 @@ public class GrailsDomainBinder
}
+ public Property getProperty(PersistentClass associatedClass, String propertyName) throws MappingException {
+ try {
+ return associatedClass.getProperty(propertyName);
+ }
+ catch (MappingException e) {
+ //maybe it's squirreled away in a composite primary key
+ if (associatedClass.getKey() instanceof Component) {
+ return ((Component) associatedClass.getKey()).getProperty(propertyName);
+ }
+ throw e;
+ }
+ }
}
\ No newline at end of file
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/CollectionBinder.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/CollectionBinder.java
index 705ed48632..612037a84c 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/CollectionBinder.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/CollectionBinder.java
@@ -51,7 +51,7 @@ public class CollectionBinder {
private static final Logger LOG = LoggerFactory.getLogger(CollectionBinder.class);
private final MetadataBuildingContext metadataBuildingContext;
- private final GrailsDomainBinder grailsDomainBinder;
+ public final GrailsDomainBinder grailsDomainBinder;
private final PersistentEntityNamingStrategy namingStrategy;
private final ListSecondPassBinder listSecondPassBinder;
private final CollectionSecondPassBinder collectionSecondPassBinder;
@@ -195,19 +195,6 @@ public class CollectionBinder {
return namingStrategy.resolveColumnName(property.getName()) + UNDERSCORE + IndexedCollection.DEFAULT_INDEX_COLUMN_NAME;
}
- public Property getProperty(PersistentClass associatedClass, String propertyName) throws MappingException {
- try {
- return associatedClass.getProperty(propertyName);
- }
- catch (MappingException e) {
- //maybe it's squirreled away in a composite primary key
- if (associatedClass.getKey() instanceof Component) {
- return ((Component) associatedClass.getKey()).getProperty(propertyName);
- }
- throw e;
- }
- }
-
public String getMultiTenantFilterCondition(PersistentEntity referenced) {
return collectionSecondPassBinder.getMultiTenantFilterCondition(referenced);
}