[hibernate#929] H2

Author: DavideD

Diff for: hibernate-reactive-core/build.gradle

@@ -31,6 +31,8 @@ dependencies {
     testImplementation 'org.assertj:assertj-core:3.22.0'
     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}"
@@ -139,7 +141,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}"
 }

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

@@ -45,13 +45,31 @@
  */
 public class ResultSetAdaptor implements ResultSet {
 
+	private static final class EmptyRowIterator implements RowIterator<Row> {
+
+		public static final EmptyRowIterator INSTANCE = new EmptyRowIterator();
+
+		private EmptyRowIterator() {
+		}
+
+		@Override
+		public boolean hasNext() {
+			return false;
+		}
+
+		@Override
+		public Row next() {
+			return null;
+		}
+	}
+
 	private final RowIterator<Row> iterator;
 	private final RowSet<Row> rows;
 	private Row row;
 	private boolean wasNull;
 
 	public ResultSetAdaptor(RowSet<Row> rows) {
-		this.iterator = rows.iterator();
+		this.iterator = rows != null ? rows.iterator() : EmptyRowIterator.INSTANCE;
 		this.rows = rows;
 	}
 

Diff for: 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 );

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

@@ -95,12 +95,16 @@ public <T> CompletionStage<T> selectIdentifier(String sql, Object[] paramValues,
 		translateNulls( 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);
-					}
-					return null;
-				} );
+				.thenApply( rowSet -> identifierFromFirstRow( idClass, rowSet ) );
+	}
+
+	private <T> T identifierFromFirstRow(Class<T> idClass, RowSet<Row> rowSet) {
+		if ( rowSet != null ) {
+			for ( Row row : rowSet ) {
+				return row.get( idClass, 0 );
+			}
+		}
+		return null;
 	}
 
 	@Override
@@ -170,7 +174,11 @@ 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 +188,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() ) {

Diff for: 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;
 		}

Diff for: 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'