[#255] Enable tests for batching

Author: DavideD

hibernate-reactive-core/src/main/java/org/hibernate/reactive/pool/impl/PostgresParameters.java

@@ -7,7 +7,7 @@
 
 public class PostgresParameters extends Parameters {
 
-    static final PostgresParameters INSTANCE = new PostgresParameters();
+    public static final PostgresParameters INSTANCE = new PostgresParameters();
 
     private PostgresParameters() {
     }

hibernate-reactive-core/src/main/java/org/hibernate/reactive/pool/impl/SQLServerParameters.java

@@ -7,7 +7,7 @@
 
 public class SQLServerParameters extends Parameters {
 
-    static final SQLServerParameters INSTANCE = new SQLServerParameters();
+    public static final SQLServerParameters INSTANCE = new SQLServerParameters();
 
     private SQLServerParameters() {
     }

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

@@ -6,19 +6,19 @@
 package org.hibernate.reactive;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.CompletionStage;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 
 import org.hibernate.cfg.Configuration;
-import org.hibernate.reactive.containers.DatabaseConfiguration;
 import org.hibernate.reactive.pool.ReactiveConnection;
-import org.hibernate.reactive.testing.DatabaseSelectionRule;
+import org.hibernate.reactive.pool.impl.PostgresParameters;
+import org.hibernate.reactive.pool.impl.SQLServerParameters;
 
 import org.junit.After;
-import org.junit.Rule;
 import org.junit.Test;
 
 import io.vertx.ext.unit.TestContext;
@@ -27,9 +27,6 @@
 
 public class BatchQueryOnConnectionTest extends BaseReactiveTest {
 
-	@Rule // Not supported at the moment
-	public DatabaseSelectionRule skip = DatabaseSelectionRule.skipTestsFor( DatabaseConfiguration.DBType.SQLSERVER );
-
 	private static final int BATCH_SIZE = 20;
 
 	@After
@@ -67,10 +64,7 @@ public void testBatchInsertUpdateSizeGtMultiple(TestContext context) {
 	}
 
 	public List<List<Object[]>> doBatchInserts(TestContext context, int nEntities, int nEntitiesMultiple) {
-		final String insertSql = "insert into DataPoint (description, x, y, id) values ";
-		final String sql = dbType().requiresDollarSyntax()
-				? insertSql + "($1, $2, $3, $4)"
-				: insertSql + "(?, ?, ?, ?)";
+		final String insertSql = process( "insert into DataPoint (description, x, y, id) values (?, ?, ?, ?)" );
 
 		List<List<Object[]>> paramsBatches = new ArrayList<>();
 		List<Object[]> paramsBatch = new ArrayList<>( BATCH_SIZE );
@@ -79,8 +73,8 @@ public List<List<Object[]>> doBatchInserts(TestContext context, int nEntities, i
 
 			DataPoint dp = new DataPoint(i);
 			dp.description = "#" + i;
-			dp.setX(new BigDecimal(i * 0.1d).setScale(19, BigDecimal.ROUND_DOWN));
-			dp.setY(new BigDecimal(dp.getX().doubleValue()*Math.PI).setScale(19, BigDecimal.ROUND_DOWN));
+			dp.setX( new BigDecimal( i * 0.1d ).setScale( 19, RoundingMode.DOWN ) );
+			dp.setY( new BigDecimal( dp.getX().doubleValue() * Math.PI ).setScale( 19, RoundingMode.DOWN ) );
 			//uncomment to expose bug in DB2 client:
 //			dp.setY(new BigDecimal(Math.cos(dp.getX().doubleValue())).setScale(19, BigDecimal.ROUND_DOWN));
 
@@ -98,7 +92,7 @@ public List<List<Object[]>> doBatchInserts(TestContext context, int nEntities, i
 
 		CompletionStage<ReactiveConnection> stage = connection();
 		for ( List<Object[]> batch : paramsBatches ) {
-			stage = stage.thenCompose( connection -> connection.update( sql, batch )
+			stage = stage.thenCompose( connection -> connection.update( insertSql, batch )
 					.thenApply( updateCounts -> {
 						context.assertEquals( batch.size(), updateCounts.length );
 						for ( int updateCount : updateCounts ) {
@@ -123,6 +117,17 @@ public List<List<Object[]>> doBatchInserts(TestContext context, int nEntities, i
 		return paramsBatches;
 	}
 
+	private String process(String sql) {
+		switch ( dbType() ) {
+			case POSTGRESQL:
+			case COCKROACHDB:
+				return PostgresParameters.INSTANCE.process( sql );
+			case SQLSERVER:
+				return SQLServerParameters.INSTANCE.process( sql );
+		}
+		return sql;
+	}
+
 	protected Configuration constructConfiguration() {
 		Configuration configuration = super.constructConfiguration();
 		configuration.addAnnotatedClass( DataPoint.class );

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

@@ -18,27 +18,23 @@ public class DatabaseConfiguration {
 	public static final boolean USE_DOCKER = Boolean.getBoolean("docker");
 
 	public enum DBType {
-		DB2( DB2Database.INSTANCE, 50000, false ),
-		MYSQL( MySQLDatabase.INSTANCE, 3306, false ),
-		MARIA( MariaDatabase.INSTANCE, 3306, false, "mariadb" ),
-		POSTGRESQL( PostgreSQLDatabase.INSTANCE, 5432, true, "POSTGRES", "PG" ),
-		COCKROACHDB( CockroachDBDatabase.INSTANCE, 26257, true, "COCKROACH" ),
-		SQLSERVER( MSSQLServerDatabase.INSTANCE, 1433, false, "MSSQL", "MSSQLSERVER" );
+		DB2( DB2Database.INSTANCE, 50000 ),
+		MYSQL( MySQLDatabase.INSTANCE, 3306 ),
+		MARIA( MariaDatabase.INSTANCE, 3306, "mariadb" ),
+		POSTGRESQL( PostgreSQLDatabase.INSTANCE, 5432, "POSTGRES", "PG" ),
+		COCKROACHDB( CockroachDBDatabase.INSTANCE, 26257, "COCKROACH" ),
+		SQLSERVER( MSSQLServerDatabase.INSTANCE, 1433, "MSSQL", "MSSQLSERVER" );
 
 		private final TestableDatabase configuration;
 		private final int defaultPort;
 
 		// A list of alternative names that can be used to select the db
 		private final String[] aliases;
 
-		// True if the database requires '$' style parameters for SQL queries
-		private boolean requiresDollarSyntax;
-
-		DBType(TestableDatabase configuration, int defaultPort, boolean requiresDollarSyntax, String... aliases) {
+		DBType(TestableDatabase configuration, int defaultPort, String... aliases) {
 			this.configuration = configuration;
 			this.defaultPort = defaultPort;
 			this.aliases = aliases;
-			this.requiresDollarSyntax = requiresDollarSyntax;
 		}
 
 		@Override
@@ -70,10 +66,6 @@ public static DBType fromString(String dbName) {
 		public int getDefaultPort() {
 			return defaultPort;
 		}
-
-		public boolean requiresDollarSyntax() {
-			return requiresDollarSyntax;
-		}
 	}
 
 	public static final String USERNAME = "hreact";