Fi

Author: DavideD

hibernate-reactive-core/src/main/java/org/hibernate/reactive/sql/results/internal/ReactiveDeferredResultSetAccess.java

@@ -150,8 +150,8 @@ private JdbcSessionContext context() {
 	}
 
 	private CompletionStage<ResultSet> executeQuery() {
-		final LogicalConnectionImplementor logicalConnection = getPersistenceContext().getJdbcCoordinator()
-				.getLogicalConnection();
+		final LogicalConnectionImplementor logicalConnection = getPersistenceContext()
+				.getJdbcCoordinator().getLogicalConnection();
 		return completedFuture( logicalConnection )
 				.thenCompose( lg -> {
 					LOG.tracef( "Executing query to retrieve ResultSet : %s", getFinalSql() );
@@ -182,6 +182,7 @@ private CompletionStage<ResultSet> executeQuery() {
 									: handler.getResultAsCompletionStage()
 							);
 				} )
+				// same as a finally block
 				.whenComplete( (o, throwable) -> logicalConnection.afterStatement() );
 	}
 

hibernate-reactive-core/src/test/java/org/hibernate/reactive/BaseReactiveTest.java

@@ -169,6 +169,7 @@ protected void addEntities(Configuration configuration) {
 	 * This method works for most common cases, but some tests might need to overrides it
 	 */
 	public CompletionStage<Void> deleteEntities(Class<?>... entities) {
+		System.out.println( "Deleting rows in the tables" );
 		return getSessionFactory()
 				.withTransaction( s -> loop( entities, entityClass -> s
 						.createQuery( queryForDelete( entityClass ) )
@@ -275,6 +276,7 @@ public void release() {
 
 	@AfterEach
 	public void after(VertxTestContext context) {
+		System.out.println( "-- Test finished, closing session and cleaning the database" );
 		test( context, closeSession( session )
 				.thenAccept( v -> session = null )
 				.thenCompose( v -> closeSession( statelessSession ) )

hibernate-reactive-core/src/test/java/org/hibernate/reactive/containers/MSSQLServerDatabase.java

@@ -77,16 +77,16 @@ class MSSQLServerDatabase implements TestableDatabase {
 		expectedDBTypeForClass.put( BigDecimal.class, "numeric" );
 		expectedDBTypeForClass.put( Serializable.class, "varbinary" );
 		expectedDBTypeForClass.put( UUID.class, "binary" );
-		expectedDBTypeForClass.put( Instant.class, "datetime2" );
+		expectedDBTypeForClass.put( Instant.class, "datetimeoffset" );
 		expectedDBTypeForClass.put( Duration.class, "bigint" );
 		expectedDBTypeForClass.put( Character.class, "char" );
 		expectedDBTypeForClass.put( char.class, "char" );
 		expectedDBTypeForClass.put( String.class, "varchar" );
-		expectedDBTypeForClass.put( String[].class, "varbinary" );
-		expectedDBTypeForClass.put( Long[].class, "varbinary" );
-		expectedDBTypeForClass.put( BigDecimal[].class, "varbinary" );
-		expectedDBTypeForClass.put( BigInteger[].class, "varbinary" );
-		expectedDBTypeForClass.put( Boolean[].class, "varbinary" );
+		expectedDBTypeForClass.put( String[].class, "xml" );
+		expectedDBTypeForClass.put( Long[].class, "xml" );
+		expectedDBTypeForClass.put( BigDecimal[].class, "xml" );
+		expectedDBTypeForClass.put( BigInteger[].class, "xml" );
+		expectedDBTypeForClass.put( Boolean[].class, "xml" );
 	}}
 
 	/**

hibernate-reactive-core/src/test/java/org/hibernate/reactive/schema/SchemaUpdateTestBase.java

@@ -24,6 +24,7 @@
 import static org.hibernate.reactive.containers.DatabaseConfiguration.DBType.DB2;
 import static org.hibernate.reactive.containers.DatabaseConfiguration.DBType.SQLSERVER;
 import static org.hibernate.reactive.containers.DatabaseConfiguration.dbType;
+import static org.hibernate.reactive.util.impl.CompletionStages.voidFuture;
 import static org.hibernate.tool.schema.JdbcMetadaAccessStrategy.GROUPED;
 import static org.hibernate.tool.schema.JdbcMetadaAccessStrategy.INDIVIDUALLY;
 
@@ -63,6 +64,11 @@ protected Configuration constructConfiguration(String action) {
 		return configuration;
 	}
 
+	@Override
+	public CompletionStage<Void> deleteEntities(Class<?>... entities) {
+		return voidFuture();
+	}
+
 	@BeforeEach
 	@Override
 	public void before(VertxTestContext context) {

hibernate-reactive-core/src/test/java/org/hibernate/reactive/types/JavaTypesArrayTest.java

@@ -16,6 +16,7 @@
 import java.util.List;
 import java.util.Set;
 import java.util.UUID;
+import java.util.concurrent.CompletionStage;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 
@@ -49,6 +50,7 @@
 import static org.hibernate.reactive.containers.DatabaseConfiguration.DBType.SQLSERVER;
 import static org.hibernate.reactive.containers.DatabaseConfiguration.dbType;
 import static org.hibernate.reactive.testing.ReactiveAssertions.assertThrown;
+import static org.hibernate.reactive.util.impl.CompletionStages.voidFuture;
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -73,6 +75,13 @@ protected Configuration constructConfiguration() {
 		return configuration;
 	}
 
+	@Override
+	public CompletionStage<Void> deleteEntities(Class<?>... entities) {
+		// Deleting the entities after each test is not really necessary, and sometimes it causes errors in the log
+		// that make it harder to figure out what's going on
+		return voidFuture();
+	}
+
 	@Override
 	protected void addServices(StandardServiceRegistryBuilder builder) {
 		sqlTracker.registerService( builder );
@@ -91,7 +100,7 @@ private void testField(VertxTestContext context, Basic original, Consumer<Basic>
 		if ( List.of( DB2, SQLSERVER ).contains( dbType() ) ) {
 			test( context, assertThrown( HibernateException.class, getSessionFactory()
 					.withTransaction( s -> s.persist( original ) ) )
-					.thenAccept( e -> assertThat( e.getMessage() ).startsWith( "HR000081" ) )
+					.thenAccept( e -> assertThat( e.getMessage() ).startsWith( "HR000081: " ) )
 			);
 		}
 		else {