HHH-18563 Auto-flush entities passed as parameters to queries

Author: dreab8

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

@@ -21,6 +21,7 @@
 import java.util.StringTokenizer;
 import java.util.function.Function;
 
+import org.hibernate.engine.spi.EntityEntry;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.internal.util.collections.CollectionHelper;
@@ -662,28 +663,32 @@ private static void createValueBindings(
 		if ( parameterType == null ) {
 			throw new SqlTreeCreationException( "Unable to interpret mapping-model type for Query parameter : " + domainParam );
 		}
-		else if ( parameterType instanceof PluralAttributeMapping ) {
+		else if ( parameterType instanceof PluralAttributeMapping pluralAttributeMapping ) {
 			// Default to the collection element
-			parameterType = ( (PluralAttributeMapping) parameterType ).getElementDescriptor();
+			parameterType = pluralAttributeMapping.getElementDescriptor();
 		}
 
-		if ( parameterType instanceof EntityIdentifierMapping ) {
-			final EntityIdentifierMapping identifierMapping = (EntityIdentifierMapping) parameterType;
+		if ( parameterType instanceof EntityIdentifierMapping identifierMapping) {
 			final EntityMappingType entityMapping = identifierMapping.findContainingEntityMapping();
 			if ( entityMapping.getRepresentationStrategy().getInstantiator().isInstance( bindValue, session.getFactory() ) ) {
 				bindValue = identifierMapping.getIdentifierIfNotUnsaved( bindValue, session );
 			}
 		}
-		else if ( parameterType instanceof EntityMappingType ) {
-			final EntityIdentifierMapping identifierMapping = ( (EntityMappingType) parameterType ).getIdentifierMapping();
+		else if ( parameterType instanceof EntityMappingType entityMappingType ) {
+			jdbcParameterBindings.addAffectedTableName(
+					entityMappingType.getEntityPersister().getTableName()
+			);
+			final EntityIdentifierMapping identifierMapping = entityMappingType.getIdentifierMapping();
 			final EntityMappingType entityMapping = identifierMapping.findContainingEntityMapping();
 			parameterType = identifierMapping;
 			if ( entityMapping.getRepresentationStrategy().getInstantiator().isInstance( bindValue, session.getFactory() ) ) {
 				bindValue = identifierMapping.getIdentifierIfNotUnsaved( bindValue, session );
 			}
 		}
-		else if ( parameterType instanceof EntityAssociationMapping ) {
-			EntityAssociationMapping association = (EntityAssociationMapping) parameterType;
+		else if ( parameterType instanceof EntityAssociationMapping association) {
+			jdbcParameterBindings.addAffectedTableName(
+					association.getAssociatedEntityMappingType().getEntityPersister().getTableName()
+			);
 			if ( association.getSideNature() == ForeignKeyDescriptor.Nature.TARGET ) {
 				// If the association is the target, we must use the identifier of the EntityMappingType
 				bindValue = association.getAssociatedEntityMappingType().getIdentifierMapping()

hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AbstractSqlAstTranslator.java

@@ -793,6 +793,9 @@ private static CteContainer matchCteContainerByStatement(final Statement stmt, f
 	public T translate(JdbcParameterBindings jdbcParameterBindings, QueryOptions queryOptions) {
 		try {
 			this.jdbcParameterBindings = jdbcParameterBindings;
+			if ( jdbcParameterBindings != null && jdbcParameterBindings.getAffectedTableNames() != null ) {
+				affectedTableNames.addAll( jdbcParameterBindings.getAffectedTableNames() );
+			}
 
 			final Statement statement = statementStack.pop();
 

hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcParameterBindingsImpl.java

@@ -8,9 +8,11 @@
 
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.IdentityHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.function.BiConsumer;
 
 import org.hibernate.dialect.Dialect;
@@ -37,6 +39,7 @@
  */
 public class JdbcParameterBindingsImpl implements JdbcParameterBindings {
 	private Map<JdbcParameter, JdbcParameterBinding> bindingMap;
+	private Set<String> affectedTableName;
 
 	public JdbcParameterBindingsImpl(int expectedParameterCount) {
 		if ( expectedParameterCount > 0 ) {
@@ -185,4 +188,17 @@ public void clear() {
 			bindingMap.clear();
 		}
 	}
+
+	@Override
+	public Set<String> getAffectedTableNames() {
+		return affectedTableName;
+	}
+
+	@Override
+	public void addAffectedTableName(String tableName) {
+		if ( affectedTableName == null ) {
+			affectedTableName = new HashSet<>( bindingMap.size() );
+		}
+		affectedTableName.add( tableName );
+	}
 }

hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcParameterBindings.java

@@ -8,6 +8,7 @@
 
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Set;
 import java.util.function.BiConsumer;
 
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
@@ -106,4 +107,12 @@ private void createAndAddBinding(
 				)
 		);
 	}
+
+	default Set<String> getAffectedTableNames(){
+		return null;
+	}
+
+	default void addAffectedTableName(String tableName){
+
+	}
 }