[#929] H2 module integration

Author: blafond

.github/workflows/tracking-orm-5.build.yml

@@ -89,7 +89,7 @@ jobs:
     strategy:
       matrix:
         orm-version: [ '[5.6,5.7)' ]
-        db: [ 'MariaDB', 'MySQL', 'PostgreSQL', 'DB2', 'CockroachDB', 'MSSQLServer', 'Oracle' ]
+        db: [ 'MariaDB', 'MySQL', 'PostgreSQL', 'DB2', 'CockroachDB', 'MSSQLServer', 'Oracle', 'H2' ]
     steps:
       - uses: actions/checkout@v2
       - name: Set up JDK 11
@@ -101,3 +101,21 @@ jobs:
       - name: Build and Test with ${{ matrix.db }}
         run: ./gradlew build -Pdb=${{ matrix.db }} -Pdocker -PhibernateOrmVersion='${{ matrix.orm-version }}' -PskipOrmVersionParsing -PenableJBossSnapshotsRep -PshowStandardOutput
 
+#  test_h2:
+#    name: Test with ${{ matrix.db }} and ORM ${{ matrix.orm-version }}
+#    runs-on: ubuntu-latest
+#    strategy:
+#      matrix:
+#        orm-version: [ '[5.6,5.7)' ]
+#        db: [ 'H2' ]
+#    steps:
+#      - uses: actions/checkout@v2
+#      - name: Set up JDK 11
+#        uses: actions/setup-java@v1
+#        with:
+#         java-version: 11
+#      - name: Print the effective ORM version used
+#        run: ./gradlew :hibernate-reactive-core:dependencyInsight --dependency org.hibernate:hibernate-core -PhibernateOrmVersion='${{ matrix.orm-version }}' -PskipOrmVersionParsing -PenableJBossSnapshotsRep
+#      - name: Build and Test with ${{ matrix.db }}
+#        run: ./gradlew build -Pdb=${{ matrix.db }} -PhibernateOrmVersion='${{ matrix.orm-version }}' -PskipOrmVersionParsing -PenableJBossSnapshotsRep -PshowStandardOutput
+

hibernate-reactive-core/build.gradle

@@ -31,6 +31,8 @@ dependencies {
     testImplementation 'org.assertj:assertj-core:3.20.2'
     testImplementation "io.vertx:vertx-unit:${vertxVersion}"
 
+    testImplementation project(':hibernate-reactive-h2')
+
     // Drivers
     testImplementation "io.vertx:vertx-pg-client:${vertxVersion}"
     testImplementation "io.vertx:vertx-mysql-client:${vertxVersion}"
@@ -132,7 +134,7 @@ tasks.addRule( "Pattern testDb<id>" ) { String taskName ->
 }
 
 // The dbs we want to test when running testAll
-def dbs = ['MariaDB', 'MySQL', 'PostgreSQL', 'DB2', 'CockroachDB', 'MSSQLServer', 'Oracle']
+def dbs = ['MariaDB', 'MySQL', 'PostgreSQL', 'DB2', 'CockroachDB', 'MSSQLServer', 'Oracle', 'H2']
 task testAll( dependsOn: dbs.collect( [] as HashSet ) { db -> "testDb${db}" } ) {
     description = "Run tests for ${dbs}"
 }

hibernate-reactive-core/src/main/java/org/hibernate/reactive/adaptor/impl/ResultSetAdaptor.java

@@ -51,7 +51,17 @@ public class ResultSetAdaptor implements ResultSet {
 	private boolean wasNull;
 
 	public ResultSetAdaptor(RowSet<Row> rows) {
-		this.iterator = rows.iterator();
+		this.iterator = rows != null ? rows.iterator() : new RowIterator<Row>() {
+			@Override
+			public boolean hasNext() {
+				return false;
+			}
+
+			@Override
+			public Row next() {
+				return null;
+			}
+		};
 		this.rows = rows;
 	}
 

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

@@ -49,6 +49,14 @@ public class DefaultSqlClientPoolConfiguration implements SqlClientPoolConfigura
 	private String user;
 	private String pass;
 
+	protected String getUser() {
+		return user;
+	}
+
+	protected String getPassword() {
+		return pass;
+	}
+
 	@Override
 	public void configure(Map configuration) {
 		user = getString( Settings.USER, configuration );
@@ -101,7 +109,7 @@ public SqlConnectOptions connectOptions(URI uri) {
 				: "";
 
 		if ( scheme.equals( "db2" ) && database.indexOf( ':' ) > 0 ) {
-			// DB2 URLs are a bit odd and have the format:
+			// DB2 URLs are a bit odd and have the format:-
 			// jdbc:db2://<HOST>:<PORT>/<DB>:key1=value1;key2=value2;
 			database = database.substring( 0, database.indexOf( ':' ) );
 		}

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

@@ -38,7 +38,7 @@ public ReactiveConnectionPoolInitiator() {}
 	@Override
 	public ReactiveConnectionPool initiateService(Map configurationValues, ServiceRegistryImplementor registry) {
 		Object configValue = configurationValues.get( Settings.SQL_CLIENT_POOL );
-		if (configValue==null) {
+		if ( configValue == null ) {
 			return new DefaultSqlClientPool();
 		}
 

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

@@ -96,8 +96,10 @@ public <T> CompletionStage<T> selectIdentifier(String sql, Object[] paramValues,
 		return preparedQuery( sql, Tuple.wrap( paramValues ) )
 				.handle( (rows, throwable) -> convertException( rows, sql, throwable ) )
 				.thenApply( rowSet -> {
-					for (Row row: rowSet) {
-						return row.get(idClass, 0);
+					if ( rowSet != null ) {
+						for ( Row row : rowSet ) {
+							return row.get( idClass, 0 );
+						}
 					}
 					return null;
 				} );
@@ -170,7 +172,12 @@ public CompletionStage<Integer> update(String sql) {
 	}
 
 	public CompletionStage<Integer> update(String sql, Tuple parameters) {
-		return preparedQuery( sql, parameters ).thenApply(SqlResult::rowCount);
+		return preparedQuery( sql, parameters )
+				.thenApply( SqlClientConnection::rowCount );
+	}
+
+	private static Integer rowCount(RowSet<Row> rows) {
+		return rows == null ? 0 : rows.rowCount();
 	}
 
 	public CompletionStage<int[]> updateBatch(String sql, List<Tuple> parametersBatch) {
@@ -180,7 +187,7 @@ public CompletionStage<int[]> updateBatch(String sql, List<Tuple> parametersBatc
 
 			int i = 0;
 			RowSet<Row> resultNext = result;
-			if ( parametersBatch.size() > 0 ) {
+			if ( result != null && parametersBatch.size() > 0 ) {
 				final RowIterator<Row> iterator = resultNext.iterator();
 				if ( iterator.hasNext() ) {
 					while ( iterator.hasNext() ) {

hibernate-reactive-core/src/main/java/org/hibernate/reactive/provider/service/NoJdbcEnvironmentInitiator.java

@@ -9,6 +9,7 @@
 import org.hibernate.dialect.CockroachDB201Dialect;
 import org.hibernate.dialect.DB297Dialect;
 import org.hibernate.dialect.Dialect;
+import org.hibernate.dialect.H2Dialect;
 import org.hibernate.dialect.MariaDB103Dialect;
 import org.hibernate.dialect.MySQL8Dialect;
 import org.hibernate.dialect.Oracle12cDialect;
@@ -35,7 +36,7 @@
 /**
  * A Hibernate {@link StandardServiceInitiator service initiator} that
  * provides an implementation of {@link JdbcEnvironment} that infers
- * the Hibernate {@link org.hibernate.dialect.Dialect} from the JDBC URL.
+ * the Hibernate {@link Dialect} from the JDBC URL.
  */
 public class NoJdbcEnvironmentInitiator extends JdbcEnvironmentInitiator {
 	private static final Log LOG = LoggerFactory.make( Log.class, MethodHandles.lookup() );
@@ -147,6 +148,9 @@ else if ( url.startsWith( "sqlserver:" ) ) {
 		else if ( url.startsWith( "oracle:" ) ) {
 			return Oracle12cDialect.class;
 		}
+		else if ( url.startsWith( "h2:" ) ) {
+			return H2Dialect.class;
+		}
 		else {
 			return null;
 		}

settings.gradle

@@ -82,6 +82,7 @@ logger.lifecycle "Java versions for main code: " + gradle.ext.javaVersions.main
 logger.lifecycle "Java versions for tests: " + gradle.ext.javaVersions.test
 
 include 'hibernate-reactive-core'
+include 'hibernate-reactive-h2'
 include 'session-example'
 include 'native-sql-example'
 include 'verticle-postgres-it'