[HHH-17288] Reference primary key only if all properties match

Author: The-Huginn

hibernate-core/src/main/java/org/hibernate/boot/model/internal/OneToOneSecondPass.java

@@ -210,7 +210,7 @@ private void bindTargetManyToOne(
 		final KeyValue targetEntityIdentifier = targetEntity.getIdentifier();
 		boolean referenceToPrimaryKey = mappedBy == null
 				|| targetEntityIdentifier instanceof Component
-						&& ( (Component) targetEntityIdentifier ).hasProperty( mappedBy );
+						&& ( (Component) targetEntityIdentifier ).matchesAllProperties( mappedBy );
 		oneToOne.setReferenceToPrimaryKey( referenceToPrimaryKey );
 
 		final String propertyRef = oneToOne.getReferencedPropertyName();

hibernate-core/src/main/java/org/hibernate/mapping/Component.java

@@ -506,6 +506,13 @@ public Property getProperty(String propertyName) throws MappingException {
 		throw new MappingException("component: " + componentClassName + " property not found: " + propertyName);
 	}
 
+	public boolean matchesAllProperties(String... propertyNames) {
+		return properties.size() == propertyNames.length &&
+				new HashSet<>(properties.stream().map(Property::getName)
+						.collect(toList()))
+						.containsAll(List.of(propertyNames));
+	}
+
 	public boolean hasProperty(String propertyName) {
 		for ( Property prop : properties ) {
 			if ( prop.getName().equals(propertyName) ) {