[#1756] Add tests for delete with RowId

Adapt test for Hibernate ORM HHH-17167

Author: DavideD

hibernate-reactive-core/src/test/java/org/hibernate/reactive/RowIdUpdateTest.java renamed to hibernate-reactive-core/src/test/java/org/hibernate/reactive/RowIdUpdateAndDeleteTest.java

@@ -33,9 +33,9 @@
 import static org.hibernate.reactive.testing.DBSelectionExtension.skipTestsFor;
 
 /**
- * Adapted from the test with the same name in Hibernate ORM: {@literal org.hibernate.orm.test.rowid.RowIdUpdateTest}
+ * Adapted from the test with the same name in Hibernate ORM: {@literal org.hibernate.orm.test.rowid.RowIdUpdateAndDeleteTest}
  */
-public class RowIdUpdateTest extends BaseReactiveTest {
+public class RowIdUpdateAndDeleteTest extends BaseReactiveTest {
 
 	// Db2: Exception: IllegalStateException: Needed to have 6 in buffer but only had 0
 	// Oracle: Vert.x driver doesn't support RowId type parameters
@@ -52,7 +52,7 @@ protected Collection<Class<?>> annotatedEntities() {
 	@Override
 	protected Configuration constructConfiguration() {
 		Configuration configuration = super.constructConfiguration();
-		sqlTracker = new SqlStatementTracker( RowIdUpdateTest::isUsingRowId, configuration.getProperties() );
+		sqlTracker = new SqlStatementTracker( RowIdUpdateAndDeleteTest::isRowIdQuery, configuration.getProperties() );
 		return configuration;
 	}
 
@@ -61,15 +61,17 @@ protected void addServices(StandardServiceRegistryBuilder builder) {
 		sqlTracker.registerService( builder );
 	}
 
-	private static boolean isUsingRowId(String s) {
-		return s.toLowerCase().startsWith( "update" );
+	private static boolean isRowIdQuery(String s) {
+		return s.toLowerCase().startsWith( "update" ) || s.toLowerCase().startsWith( "delete" );
 	}
 
 	@BeforeEach
 	public void prepareDb(VertxTestContext context) {
 		test( context, getMutinySessionFactory().withTransaction( session -> session.persistAll(
 				new SimpleEntity( 1L, "initial_status" ),
-				new ParentEntity( 2L, new SimpleEntity( 2L, "initial_status" ) )
+				new ParentEntity( 2L, new SimpleEntity( 2L, "initial_status" ) ),
+				new SimpleEntity( 11L, "to_delete" ),
+				new ParentEntity( 12L, new SimpleEntity( 12L, "to_delete" ) )
 		) ) );
 	}
 
@@ -86,11 +88,30 @@ public void testSimpleUpdateSameTransaction(VertxTestContext context) {
 				.chain( () -> getMutinySessionFactory()
 						.withSession( session -> session.find( SimpleEntity.class, 3L ) ) )
 				// the update should have used the primary key, as the row-id value is not available
-				.invoke( RowIdUpdateTest::shouldUsePrimaryKey )
+				.invoke( RowIdUpdateAndDeleteTest::shouldUsePrimaryKeyForUpdate )
 				.invoke( entity -> assertThat( entity ).hasFieldOrPropertyWithValue( "status", "new_status" ) )
 		);
 	}
 
+	@Test
+	public void testSimpleDeleteSameTransaction(VertxTestContext context) {
+		sqlTracker.clear();
+		test( context, getMutinySessionFactory()
+				.withTransaction( session -> {
+					final SimpleEntity simpleEntity = new SimpleEntity( 13L, "to_delete" );
+					return session.persist( simpleEntity )
+							.call( session::flush )
+							.call( () -> session.remove( simpleEntity ) )
+							.invoke( () -> simpleEntity.setStatus( "new_status" ) );
+				} )
+				.chain( () -> getMutinySessionFactory()
+						.withSession( session -> session.find( SimpleEntity.class, 13L ) ) )
+				// the update should have used the primary key, as the row-id value is not available
+				.invoke( RowIdUpdateAndDeleteTest::shouldUsePrimaryKeyForDelete )
+				.invoke( entity -> assertThat( entity ).isNull() )
+		);
+	}
+
 	@Test
 	public void testRelatedUpdateSameTransaction(VertxTestContext context) {
 		sqlTracker.clear();
@@ -105,11 +126,26 @@ public void testRelatedUpdateSameTransaction(VertxTestContext context) {
 				.chain( () -> getMutinySessionFactory()
 						.withSession( session -> session.find( SimpleEntity.class, 4L ) ) )
 				// the update should have used the primary key, as the row-id value is not available
-				.invoke( RowIdUpdateTest::shouldUsePrimaryKey )
+				.invoke( RowIdUpdateAndDeleteTest::shouldUsePrimaryKeyForUpdate )
 				.invoke( entity -> assertThat( entity ).hasFieldOrPropertyWithValue( "status", "new_status" ) )
 		);
 	}
 
+	@Test
+	public void testSimpleDeleteDifferentTransaction(VertxTestContext context) {
+		sqlTracker.clear();
+		test( context, getMutinySessionFactory()
+				.withTransaction( session -> session
+						.find( SimpleEntity.class, 11L )
+						.call( session::remove )
+				)
+				.chain( () -> getMutinySessionFactory()
+						.withSession( session -> session.find( SimpleEntity.class, 11L ) ) )
+				.invoke( RowIdUpdateAndDeleteTest::shouldUseRowIdForDelete )
+				.invoke( entity -> assertThat( entity ).isNull() )
+		);
+	}
+
 	@Test
 	public void testSimpleUpdateDifferentTransaction(VertxTestContext context) {
 		sqlTracker.clear();
@@ -120,7 +156,7 @@ public void testSimpleUpdateDifferentTransaction(VertxTestContext context) {
 				)
 				.chain( () -> getMutinySessionFactory()
 						.withSession( session -> session.find( SimpleEntity.class, 1L ) ) )
-				.invoke( RowIdUpdateTest::shouldUseRowId )
+				.invoke( RowIdUpdateAndDeleteTest::shouldUseRowIdForUpdate )
 				.invoke( entity -> assertThat( entity ).hasFieldOrPropertyWithValue( "status", "new_status" ) )
 		);
 	}
@@ -133,7 +169,7 @@ public void testRelatedUpdateRelatedDifferentTransaction(VertxTestContext contex
 						.find( ParentEntity.class, 2L )
 						.invoke( entity -> entity.getChild().setStatus( "new_status" ) )
 				)
-				.invoke( RowIdUpdateTest::shouldUseRowId )
+				.invoke( RowIdUpdateAndDeleteTest::shouldUseRowIdForUpdate )
 				.chain( () -> getMutinySessionFactory()
 						.withSession( session -> session.find( SimpleEntity.class, 2L ) ) )
 				.invoke( entity -> assertThat( entity )
@@ -142,13 +178,19 @@ public void testRelatedUpdateRelatedDifferentTransaction(VertxTestContext contex
 		);
 	}
 
-	private static void shouldUsePrimaryKey() {
+	private static void shouldUsePrimaryKeyForUpdate() {
 		assertThat( sqlTracker.getLoggedQueries() ).hasSize( 1 );
 		assertThat( sqlTracker.getLoggedQueries().get( 0 ) )
 				.matches( "update SimpleEntity set status=.+ where primary_key=.+" );
 	}
 
-	private static void shouldUseRowId() {
+	private static void shouldUsePrimaryKeyForDelete() {
+		assertThat( sqlTracker.getLoggedQueries() ).hasSize( 1 );
+		assertThat( sqlTracker.getLoggedQueries().get( 0 ) )
+				.matches( "delete from SimpleEntity where primary_key=.+" );
+	}
+
+	private static void shouldUseRowIdForUpdate() {
 		// Not all databases have a rowId column
 		String rowId = getDialect().rowId( "" );
 		String column = rowId == null ? "primary_key" : rowId;
@@ -157,6 +199,15 @@ private static void shouldUseRowId() {
 				.matches( "update SimpleEntity set status=.+ where " + column + "=.+" );
 	}
 
+	private static void shouldUseRowIdForDelete() {
+		// Not all databases have a rowId column
+		String rowId = getDialect().rowId( "" );
+		String column = rowId == null ? "primary_key" : rowId;
+		assertThat( sqlTracker.getLoggedQueries() ).hasSize( 1 );
+		assertThat( sqlTracker.getLoggedQueries().get( 0 ) )
+				.matches( "delete from SimpleEntity where " + column + "=.+" );
+	}
+
 	@Entity(name = "SimpleEntity")
 	@Table(name = "SimpleEntity")
 	@RowId