HHH-16033 Many-to-Many inverse mapping referencing the same class uses pk instead of fk field for removal

Author: dreab8

hibernate-core/src/main/java/org/hibernate/event/internal/DefaultDeleteEventListener.java

@@ -263,6 +263,7 @@ private boolean canBeDeletedWithoutLoading(EventSource source, EntityPersister p
 			&& !persister.hasSubclasses() //TODO: should be unnecessary, using EntityPersister.getSubclassPropertyTypeClosure(), etc
 			&& !persister.hasCascadeDelete()
 			&& !persister.hasNaturalIdentifier()
+			&& !persister.hasCollectionNotReferencingPK()
 			&& !hasRegisteredRemoveCallbacks( persister )
 			&& !hasCustomEventListeners( source );
 	}

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

@@ -8,6 +8,7 @@
 
 import java.io.Serializable;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -36,6 +37,7 @@
 import org.hibernate.query.sqm.function.SqmFunctionRegistry;
 import org.hibernate.service.ServiceRegistry;
 import org.hibernate.sql.Alias;
+import org.hibernate.type.CollectionType;
 import org.hibernate.type.Type;
 import org.hibernate.type.spi.TypeConfiguration;
 
@@ -1131,6 +1133,28 @@ public void setSubselectLoadableCollections(boolean hasSubselectCollections) {
 		this.hasSubselectLoadableCollections = hasSubselectCollections;
 	}
 
+	public boolean hasCollectionNotReferencingPK() {
+		return hasCollectionNotReferencingPK( properties );
+	}
+
+	private boolean hasCollectionNotReferencingPK(Collection<Property> properties) {
+		for ( Property property : properties ) {
+			final Value value = property.getValue();
+			if ( value instanceof Component ) {
+				if ( hasCollectionNotReferencingPK( ( (Component) value ).getProperties() ) ) {
+					return true;
+				}
+			}
+			else if ( value instanceof org.hibernate.mapping.Collection ) {
+				final org.hibernate.mapping.Collection collection = (org.hibernate.mapping.Collection) value;
+				if ( !( (CollectionType) collection.getType() ).useLHSPrimaryKey() ) {
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
 	public boolean hasPartitionedSelectionMapping() {
 		if ( getSuperclass() != null && getSuperclass().hasPartitionedSelectionMapping() ) {
 			return true;

hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java

@@ -355,6 +355,7 @@ public abstract class AbstractEntityPersister
 	protected final int batchSize;
 	private final boolean hasSubselectLoadableCollections;
 	private final boolean hasPartitionedSelectionMapping;
+	private final boolean hasCollectionNotReferencingPK;
 	protected final String rowIdName;
 
 	// The optional SQL string defined in the where attribute
@@ -533,6 +534,7 @@ public AbstractEntityPersister(
 		batchSize = batch;
 		hasSubselectLoadableCollections = persistentClass.hasSubselectLoadableCollections();
 		hasPartitionedSelectionMapping = persistentClass.hasPartitionedSelectionMapping();
+		hasCollectionNotReferencingPK = persistentClass.hasCollectionNotReferencingPK();
 
 		propertyMapping = new BasicEntityPropertyMapping( this );
 
@@ -4435,6 +4437,11 @@ public boolean hasSubselectLoadableCollections() {
 		return hasSubselectLoadableCollections;
 	}
 
+	@Override
+	public boolean hasCollectionNotReferencingPK() {
+		return hasCollectionNotReferencingPK;
+	}
+
 	@Override
 	public int[] getNaturalIdentifierProperties() {
 		return entityMetamodel.getNaturalIdentifierProperties();

hibernate-core/src/main/java/org/hibernate/persister/entity/EntityPersister.java

@@ -282,6 +282,15 @@ default void visitQuerySpaces(Consumer<String> querySpaceConsumer) {
 	 */
 	boolean hasSubselectLoadableCollections();
 
+	/**
+	 * Determine whether this entity contains references to persistent collections
+	 * not referencing the primary key.
+	 *
+	 * @return True if the entity contains a collection not referencing the primary key; false otherwise.
+	 * @since 6.2
+	 */
+	boolean hasCollectionNotReferencingPK();
+
 	/**
 	 * Determine whether this entity has any
 	 * (non-{@linkplain org.hibernate.engine.spi.CascadeStyles#NONE none}) cascading.

hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/GoofyPersisterClassProvider.java

@@ -271,6 +271,11 @@ public boolean hasSubselectLoadableCollections() {
 			return false;
 		}
 
+		@Override
+		public boolean hasCollectionNotReferencingPK() {
+			return false;
+		}
+
 		@Override
 		public boolean hasCascades() {
 			return false;

hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/PersisterClassProviderTest.java

@@ -298,6 +298,11 @@ public boolean hasSubselectLoadableCollections() {
 			return false;
 		}
 
+		@Override
+		public boolean hasCollectionNotReferencingPK() {
+			return false;
+		}
+
 		@Override
 		public boolean hasCascades() {
 			return false;

hibernate-core/src/test/java/org/hibernate/orm/test/legacy/CustomPersister.java

@@ -696,6 +696,11 @@ public boolean hasSubselectLoadableCollections() {
 		return false;
 	}
 
+	@Override
+	public boolean hasCollectionNotReferencingPK() {
+		return false;
+	}
+
 	@Override
 	public int[] getNaturalIdentifierProperties() {
 		return null;