HHH-7135 Disallow @mapsid on unowned @OnetoOne

hibernate · Jan 13, 2025 · 4fac597 · 4fac597
1 parent a8e881e
commit 4fac597
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ColumnsBuilder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/ColumnsBuilder.java
@@ -289,6 +289,11 @@ private JoinColumn[] getJoinColumnAnnotations(MemberDetails property, PropertyDa
 	 */
 	AnnotatedColumns overrideColumnFromMapperOrMapsIdProperty(PropertyData override) {
 		if ( override != null ) {
+			final OneToOne oneToOneAnn = override.getAttributeMember().getDirectAnnotationUsage( OneToOne.class );
+			if ( oneToOneAnn != null && nullIfEmpty( oneToOneAnn.mappedBy() ) != null ) {
+				throw new AnnotationException( "Property '" + getPath( propertyHolder, override )
+											+ "' is annotated '@MapsId' but has no columns due to its '@OneToOne(mappedBy)' usage" );
+			}
 			final AnnotatedJoinColumns joinColumns = buildExplicitJoinColumns( override.getAttributeMember(), override );
 			return joinColumns == null
 					? buildDefaultJoinColumnsForToOne( override.getAttributeMember(), override )