HHH-17280 Allow partial embedded fk resolution on parent

hibernate · Nov 27, 2023 · d25fb20 · d25fb20
1 parent 7245ab7
commit d25fb20
Showing 1 changed file with 8 additions and 10 deletions.
diff --git a/.../src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedForeignKeyDescriptor.java b/.../src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedForeignKeyDescriptor.java
@@ -16,16 +16,16 @@
 import org.hibernate.internal.util.IndexedConsumer;
 import org.hibernate.internal.util.MutableInteger;
 import org.hibernate.metamodel.mapping.AssociationKey;
-import org.hibernate.metamodel.mapping.AttributeMappingsList;
+import org.hibernate.metamodel.mapping.AttributeMapping;
 import org.hibernate.metamodel.mapping.CompositeIdentifierMapping;
+import org.hibernate.metamodel.mapping.EmbeddableMappingType;
 import org.hibernate.metamodel.mapping.EmbeddableValuedModelPart;
 import org.hibernate.metamodel.mapping.EntityMappingType;
 import org.hibernate.metamodel.mapping.ForeignKeyDescriptor;
 import org.hibernate.metamodel.mapping.JdbcMapping;
 import org.hibernate.metamodel.mapping.ManagedMappingType;
 import org.hibernate.metamodel.mapping.MappingType;
 import org.hibernate.metamodel.mapping.ModelPart;
-import org.hibernate.metamodel.mapping.NonAggregatedIdentifierMapping;
 import org.hibernate.metamodel.mapping.SelectableConsumer;
 import org.hibernate.metamodel.mapping.SelectableMapping;
 import org.hibernate.metamodel.mapping.SelectableMappings;
@@ -196,18 +196,16 @@ public boolean isKeyPart(ValuedModelPart modelPart) {
 		if ( this == modelPart || keyPart == modelPart ) {
 			return true;
 		}
-		else if ( keyPart instanceof NonAggregatedIdentifierMapping ) {
-			final AttributeMappingsList attributeMappings = ( (NonAggregatedIdentifierMapping) keyPart ).getVirtualIdEmbeddable()
-					.getAttributeMappings();
-			for ( int i = 0; i < attributeMappings.size(); i++ ) {
-				if ( modelPart == attributeMappings.get( i ) ) {
+		else {
+			AttributeMapping attributeMapping = modelPart.asAttributeMapping();
+			while ( attributeMapping != null && attributeMapping.getDeclaringType() instanceof EmbeddableMappingType ) {
+				final EmbeddableValuedModelPart declaringModelPart = ( (EmbeddableMappingType) attributeMapping.getDeclaringType() ).getEmbeddedValueMapping();
+				if ( declaringModelPart == keyPart ) {
 					return true;
 				}
+				attributeMapping = declaringModelPart.asAttributeMapping();
 			}
 		}
-		else if ( keyPart.isVirtual() && keyPart.getNumberOfFetchables() == 1 ) {
-			return keyPart.getFetchable( 0 ) == modelPart;
-		}
 		return false;
 	}