HHH-17885 Fix for same named attribute of different Embedded uses same selection expression

Author: beikov

hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractEmbeddableMapping.java

@@ -302,7 +302,7 @@ protected boolean finishInitialization(
 					scale = null;
 					nullable = true;
 					isLob = false;
-					selectablePath = basicValue.createSelectablePath( bootPropertyDescriptor.getName() );
+					selectablePath = new SelectablePath( determineEmbeddablePrefix() + bootPropertyDescriptor.getName() );
 				}
 
 				attributeMapping = MappingModelCreationHelper.buildBasicAttributeMapping(
@@ -453,6 +453,14 @@ else if ( subtype instanceof EntityType ) {
 		return true;
 	}
 
+	protected String determineEmbeddablePrefix() {
+		NavigableRole root = getNavigableRole().getParent();
+		while ( !root.isRoot() ) {
+			root = root.getParent();
+		}
+		return getNavigableRole().getFullPath().substring( root.getFullPath().length() + 1 ) + ".";
+	}
+
 	@Override
 	public int getNumberOfFetchables() {
 		return getAttributeMappings().size();

hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddableMappingTypeImpl.java

@@ -398,7 +398,7 @@ private boolean finishInitialization(
 					scale = null;
 					isLob = false;
 					nullable = bootPropertyDescriptor.isOptional();
-					selectablePath = basicValue.createSelectablePath( bootPropertyDescriptor.getName() );
+					selectablePath = new SelectablePath( determineEmbeddablePrefix() + bootPropertyDescriptor.getName() );
 				}
 				attributeMapping = MappingModelCreationHelper.buildBasicAttributeMapping(
 						bootPropertyDescriptor.getName(),

hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/NavigableRole.java

@@ -106,10 +106,6 @@ public String getFullPath() {
 		return fullPath;
 	}
 
-	public boolean isRoot() {
-		return parent == null && StringHelper.isEmpty( localName );
-	}
-
 	@Override
 	public String toString() {
 		return getClass().getSimpleName() + '[' + fullPath + ']';