HHH-7287 - Problem in caching proper natural-id-values when obtaining result by naturalIdQuery

Author: sebersole

hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/MutableNaturalIdTest.java

@@ -29,6 +29,7 @@
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNotSame;
 import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
 
 /**
  * @author Gavin King
@@ -58,7 +59,7 @@ public void testNaturalIdNullability(SessionFactoryScope scope) {
 
 	@AfterEach
 	public void dropTestData(SessionFactoryScope scope) {
-		scope.getSessionFactory().getSchemaManager().truncate();
+		scope.dropData();
 	}
 
 	@Test
@@ -362,4 +363,41 @@ public void testEviction(SessionFactoryScope scope) {
 				}
 		);
 	}
+
+	@Test
+	@JiraKey("HHH-7287")
+	public void testModificationInOtherSession(SessionFactoryScope factoryScope) {
+		factoryScope.inTransaction( (session) -> {
+			User u = new User( "gavin", "hb", "secret" );
+			session.persist( u );
+		} );
+
+		// Use transactionless session
+		factoryScope.inSession( (session) -> {
+			// this loads the state into this `session`
+			var byNaturalId = session.byNaturalId( User.class ).using( "name", "gavin" ).using( "org", "hb" ).load();
+			assertNotNull( byNaturalId );
+
+			// CHANGE natural-id values in another session
+			factoryScope.inTransaction( (otherSession) -> {
+				var u = otherSession.find(  User.class, 1 );
+				u.setOrg( "zz" );
+			} );
+			// CHANGE APPLIED
+
+			byNaturalId = session.byNaturalId( User.class )
+					.using( "name", "gavin" )
+					.using( "org", "hb" ).load();
+			assertNotNull( byNaturalId );
+
+			// the internal query will 'see' the new values, because isolation level < SERIALIZABLE
+			var byNaturalId2 = session.byNaturalId( User.class )
+					.using( "name", "gavin" )
+					.using( "org", "zz" ).load();
+			assertSame( byNaturalId, byNaturalId2 );
+
+			// this fails, that's the bug
+			assertNotNull( session.byNaturalId( User.class ).using( "name", "gavin" ).using( "org", "hb" ).load());
+		} );
+	}
 }