HHH-16049 Test setting a property to its current value with bytecode …

…enhancement enabled
hibernate · Jan 24, 2023 · 802fc76 · 802fc76
1 parent ac55bb2
commit 802fc76
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 14 deletions.
diff --git a/...st/java/org/hibernate/test/bytecode/enhancement/lazy/LazyLoadingByEnhancerSetterTest.java b/...st/java/org/hibernate/test/bytecode/enhancement/lazy/LazyLoadingByEnhancerSetterTest.java
@@ -86,7 +86,7 @@ public void testField() {
     }
 
     @Test
-//    @FailureExpected( jiraKey = "HHH-10747" )
+    @FailureExpected( jiraKey = "HHH-10747" )
     public void testProperty() {
         doInHibernate( this::sessionFactory, s -> {
             ItemProperty input = new ItemProperty();

diff --git a/.../java/org/hibernate/test/bytecode/enhancement/lazy/basic/EagerAndLazyBasicUpdateTest.java b/.../java/org/hibernate/test/bytecode/enhancement/lazy/basic/EagerAndLazyBasicUpdateTest.java
@@ -86,8 +86,9 @@ public void updateOneLazyProperty_nullToNull() {
 			entity.setLazyProperty1( null );
 		} );
 
-		// We should not update entities when property values did not change
-		statementInspector().assertNoUpdate();
+		// When a lazy property is modified Hibernate does not perform any select
+		// but during flush an update is performed
+		statementInspector().assertUpdate();
 	}
 
 	@Test
@@ -130,8 +131,9 @@ public void updateOneLazyProperty_nonNullToNonNull_sameValues() {
 			entity.setLazyProperty1( "lazy1_update" );
 		} );
 
-		// We should not update entities when property values did not change
-		statementInspector().assertNoUpdate();
+		// When a lazy property is modified Hibernate does not perform any select
+		// but during flush an update is performed
+		statementInspector().assertUpdate();
 	}
 
 	@Test
@@ -199,7 +201,7 @@ public void updateOneEagerProperty_nonNullToNonNull_sameValues() {
 		initNonNull();
 		doInHibernate( this::sessionFactory, s -> {
 			LazyEntity entity = s.get( LazyEntity.class, entityId );
-			entity.setEagerProperty( "eager_update" );
+			entity.setEagerProperty( "eager_initial" );
 		} );
 
 		// We should not update entities when property values did not change
@@ -231,8 +233,9 @@ public void updateOneEagerPropertyAndOneLazyProperty_nullToNull() {
 			entity.setLazyProperty1( null );
 		} );
 
-		// We should not update entities when property values did not change
-		statementInspector().assertNoUpdate();
+		// When a lazy property is modified Hibernate does not perform any select
+		// but during flush an update is performed
+		statementInspector().assertUpdate();
 	}
 
 	@Test
@@ -308,8 +311,9 @@ public void updateAllLazyProperties_nullToNull() {
 			entity.setLazyProperty2( null );
 		} );
 
-		// We should not update entities when property values did not change
-		statementInspector().assertNoUpdate();
+		// When a lazy property is modified Hibernate does not perform any select
+		// but during flush an update is performed
+		statementInspector().assertUpdate();
 	}
 
 	@Test

diff --git a/...test/java/org/hibernate/test/bytecode/enhancement/lazy/basic/OnlyLazyBasicUpdateTest.java b/...test/java/org/hibernate/test/bytecode/enhancement/lazy/basic/OnlyLazyBasicUpdateTest.java
@@ -84,8 +84,9 @@ public void updateSomeLazyProperty_nullToNull() {
 			entity.setLazyProperty1( null );
 		} );
 
-		// We should not update entities when property values did not change
-		statementInspector().assertNoUpdate();
+		// When a lazy property is modified Hibernate does not perform any select
+		// but during flush an update is performed
+		statementInspector().assertUpdate();
 	}
 
 	@Test
@@ -154,8 +155,9 @@ public void updateAllLazyProperties_nullToNull() {
 			entity.setLazyProperty2( null );
 		} );
 
-		// We should not update entities when property values did not change
-		statementInspector().assertNoUpdate();
+		// When a lazy property is modified Hibernate does not perform any select
+		// but during flush an update is performed
+		statementInspector().assertUpdate();
 	}
 
 	@Test

diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/jdbc/SQLStatementInspector.java b/hibernate-testing/src/main/java/org/hibernate/testing/jdbc/SQLStatementInspector.java
@@ -107,6 +107,12 @@ public void assertNoUpdate() {
 				.allSatisfy( sql -> Assertions.assertThat( sql.toLowerCase( Locale.ROOT ) ).doesNotStartWith( "update" ) );
 	}
 
+	public void assertUpdate() {
+		Assertions.assertThat( sqlQueries )
+				.isNotEmpty()
+				.anySatisfy( sql -> Assertions.assertThat( sql.toLowerCase( Locale.ROOT ) ).startsWith( "update" ) );
+	}
+
 	public static SQLStatementInspector extractFromSession(SessionImplementor session) {
 		return (SQLStatementInspector) session.getJdbcSessionContext().getStatementInspector();
 	}