HHH-18563 Add test using foreign key property

Author: beikov

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

@@ -1299,7 +1299,7 @@ private List<Assignment> getCompatibleAssignments(InsertSelectStatement dmlState
 		final List<Assignment> assignments = conflictClause.getAssignments();
 		for ( Assignment assignment : assignments ) {
 			for ( ColumnReference targetColumn : dmlStatement.getTargetColumns() ) {
-				if ( targetColumn.equals( assignment.getAssignable() ) ) {
+				if ( assignment.getAssignable().getColumnReferences().contains( targetColumn ) ) {
 					if ( compatibleAssignments == null ) {
 						compatibleAssignments = new ArrayList<>( assignments.size() );
 					}

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

@@ -12,7 +12,6 @@
 import org.hibernate.dialect.Dialect;
 import org.hibernate.dialect.FunctionalDependencyAnalysisSupport;
 import org.hibernate.metamodel.mapping.BasicValuedModelPart;
-import org.hibernate.metamodel.mapping.EmbeddableValuedModelPart;
 import org.hibernate.metamodel.mapping.EntityAssociationMapping;
 import org.hibernate.metamodel.mapping.EntityDiscriminatorMapping;
 import org.hibernate.metamodel.mapping.EntityIdentifierMapping;

hibernate-core/src/test/java/org/hibernate/orm/test/flush/AutoFlushOnUpdateQueryTest.java

@@ -1,6 +1,9 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
 package org.hibernate.orm.test.flush;
 
-import org.hibernate.testing.jdbc.SQLStatementInspector;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
@@ -22,9 +25,7 @@
 				AutoFlushOnUpdateQueryTest.Fruit.class,
 		}
 )
-@SessionFactory(
-		statementInspectorClass = SQLStatementInspector.class
-)
+@SessionFactory
 public class AutoFlushOnUpdateQueryTest {
 
 	public static final String FRUIT_NAME = "Apple";
@@ -50,8 +51,6 @@ public void tearDown(SessionFactoryScope scope) {
 
 	@Test
 	public void testFlushIsExecuted(SessionFactoryScope scope) {
-		SQLStatementInspector statementInspector = scope.getStatementInspector( SQLStatementInspector.class );
-		statementInspector.clear();
 		scope.inTransaction(
 				session -> {
 					Fruit fruit = session
@@ -81,6 +80,37 @@ public void testFlushIsExecuted(SessionFactoryScope scope) {
 		);
 	}
 
+	@Test
+	public void testFlushIsExecuted2(SessionFactoryScope scope) {
+		scope.inTransaction(
+				session -> {
+					Fruit fruit = session
+							.createQuery(
+									"select f from Fruit f where f.name = :name",
+									Fruit.class
+							).setParameter( "name", FRUIT_NAME ).getSingleResult();
+
+					FruitLogEntry logEntry = new FruitLogEntry( fruit, "foo" );
+					session.persist( logEntry );
+
+					session.createMutationQuery( "update Fruit f set f.logEntry.id = :logEntryId where f.id = :fruitId" )
+							.setParameter( "logEntryId", logEntry.getId() )
+							.setParameter( "fruitId", fruit.getId() ).executeUpdate();
+				}
+		);
+
+		scope.inTransaction(
+				session -> {
+					Fruit fruit = session
+							.createQuery(
+									"select f from Fruit f where f.name = :name",
+									Fruit.class
+							).setParameter( "name", FRUIT_NAME ).getSingleResult();
+					assertThat( fruit.getLogEntry() ).isNotNull();
+				}
+		);
+	}
+
 	@Entity(name = "Fruit")
 	public static class Fruit {