HHH-20200 Handle table-per-class inheritance in soft-deletes

Author: mbellade

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

@@ -236,13 +236,25 @@ public TableGroup createRootTableGroup(
 			SqlAliasBase sqlAliasBase,
 			Supplier<Consumer<Predicate>> additionalPredicateCollectorAccess,
 			SqlAstCreationState creationState) {
-		return new UnionTableGroup(
+		final var tableGroup = new UnionTableGroup(
 				canUseInnerJoins,
 				navigablePath,
 				createPrimaryTableReference( sqlAliasBase, creationState ),
 				this,
 				explicitSourceAlias
 		);
+		final var softDeleteMapping = getSoftDeleteMapping();
+		if ( additionalPredicateCollectorAccess != null && softDeleteMapping != null ) {
+			final var tableReference =
+					tableGroup.resolveTableReference( getSoftDeleteTableDetails().getTableName() );
+			additionalPredicateCollectorAccess.get().accept(
+					softDeleteMapping.createNonDeletedRestriction(
+							tableReference,
+							creationState.getSqlExpressionResolver()
+					)
+			);
+		}
+		return tableGroup;
 	}
 
 	@Override

hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/SqmMutationStrategyHelper.java

@@ -4,6 +4,8 @@
  */
 package org.hibernate.query.sqm.mutation.internal;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.function.BiConsumer;
 import java.util.function.BiFunction;
 import java.util.function.Consumer;
@@ -42,6 +44,7 @@
 import org.hibernate.metamodel.mapping.internal.EmbeddedAttributeMapping;
 import org.hibernate.metamodel.mapping.internal.ToOneAttributeMapping;
 import org.hibernate.persister.entity.EntityPersister;
+import org.hibernate.persister.entity.UnionSubclassEntityPersister;
 import org.hibernate.query.spi.QueryOptions;
 import org.hibernate.sql.ast.tree.AbstractUpdateOrDeleteStatement;
 import org.hibernate.sql.ast.tree.delete.DeleteStatement;
@@ -214,6 +217,24 @@ private static void visitCollectionTableDeletes(
 		);
 	}
 
+	/**
+	 * Returns the entity descriptors whose soft-delete tables need to be updated.
+	 * Only {@code TABLE_PER_CLASS} requires multiple targets (one per concrete
+	 * subtype table); other inheritance strategies share a single soft-delete table.
+	 */
+	public static List<EntityMappingType> softDeleteTargets(EntityMappingType entityDescriptor) {
+		if ( entityDescriptor.getEntityPersister() instanceof UnionSubclassEntityPersister ) {
+			// TABLE_PER_CLASS: each concrete subtype has its own table with the soft-delete column
+			final var targets = new ArrayList<EntityMappingType>();
+			targets.add( entityDescriptor );
+			targets.addAll( entityDescriptor.getSubMappingTypes() );
+			return targets;
+		}
+		else {
+			return singletonList( entityDescriptor );
+		}
+	}
+
 	public static boolean isId(JdbcMappingContainer type) {
 		return type instanceof EntityIdentifierMapping || type instanceof AttributeMapping attributeMapping
 														&& isPartOfId( attributeMapping );

hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/CteSoftDeleteHandler.java

@@ -6,6 +6,7 @@
 
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.internal.util.MutableObject;
+import org.hibernate.metamodel.mapping.EntityMappingType;
 import org.hibernate.metamodel.mapping.SoftDeleteMapping;
 import org.hibernate.metamodel.mapping.TableDetails;
 import org.hibernate.query.spi.DomainQueryExecutionContext;
@@ -27,6 +28,8 @@
 import java.util.Collections;
 import java.util.List;
 
+import static org.hibernate.query.sqm.mutation.internal.SqmMutationStrategyHelper.softDeleteTargets;
+
 /**
  * Specialized CteDeleteHandler for soft-delete handling
  *
@@ -50,8 +53,19 @@ protected void applyDmlOperations(
 			CteStatement idSelectCte,
 			SessionFactoryImplementor factory,
 			TableGroup updatingTableGroup) {
-		final SoftDeleteMapping softDeleteMapping = getEntityDescriptor().getSoftDeleteMapping();
-		final TableDetails softDeleteTable = getEntityDescriptor().getSoftDeleteTableDetails();
+		for ( var target : softDeleteTargets( getEntityDescriptor() ) ) {
+			addSoftDeleteCte( statement, idSelectCte, factory, updatingTableGroup, target );
+		}
+	}
+
+	private void addSoftDeleteCte(
+			CteContainer statement,
+			CteStatement idSelectCte,
+			SessionFactoryImplementor factory,
+			TableGroup updatingTableGroup,
+			EntityMappingType entityDescriptor) {
+		final SoftDeleteMapping softDeleteMapping = entityDescriptor.getSoftDeleteMapping();
+		final TableDetails softDeleteTable = entityDescriptor.getSoftDeleteTableDetails();
 		final CteTable dmlResultCte = new CteTable(
 				getCteTableName( softDeleteTable.getTableName() ),
 				idSelectCte.getCteTable().getCteColumns()

hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/inline/InlineDeleteHandler.java

@@ -9,16 +9,17 @@
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.internal.util.MutableInteger;
 import org.hibernate.internal.util.MutableObject;
+import org.hibernate.metamodel.mapping.EntityMappingType;
 import org.hibernate.metamodel.mapping.ModelPart;
 import org.hibernate.metamodel.mapping.SelectableConsumer;
 import org.hibernate.metamodel.mapping.SoftDeleteMapping;
 import org.hibernate.metamodel.mapping.TableDetails;
-import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.query.spi.DomainQueryExecutionContext;
 import org.hibernate.query.sqm.internal.DomainParameterXref;
 import org.hibernate.query.sqm.internal.SqmJdbcExecutionContextAdapter;
 import org.hibernate.query.sqm.mutation.internal.DeleteHandler;
 import org.hibernate.query.sqm.mutation.internal.MatchingIdSelectionHelper;
+import static org.hibernate.query.sqm.mutation.internal.SqmMutationStrategyHelper.softDeleteTargets;
 import org.hibernate.query.sqm.mutation.internal.SqmMutationStrategyHelper;
 import org.hibernate.query.sqm.tree.delete.SqmDeleteStatement;
 import org.hibernate.sql.ast.SqlAstTranslatorFactory;
@@ -62,7 +63,9 @@ protected InlineDeleteHandler(
 
 		final SoftDeleteMapping softDeleteMapping = getEntityDescriptor().getSoftDeleteMapping();
 		if ( softDeleteMapping != null ) {
-			tableDeleters.add( createSoftDeleter() );
+			for ( var target : softDeleteTargets( getEntityDescriptor() ) ) {
+				tableDeleters.add( createSoftDeleter( target ) );
+			}
 		}
 		else {
 			// delete from the tables
@@ -124,8 +127,7 @@ protected InlineDeleteHandler(
 		this.tableDeleters = tableDeleters;
 	}
 
-	private TableDeleter createSoftDeleter() {
-		final EntityPersister entityDescriptor = getEntityDescriptor();
+	private TableDeleter createSoftDeleter(EntityMappingType entityDescriptor) {
 		final TableDetails softDeleteTable = entityDescriptor.getSoftDeleteTableDetails();
 		final SoftDeleteMapping softDeleteMapping = entityDescriptor.getSoftDeleteMapping();
 		assert softDeleteMapping != null;