fix

hibernate · Apr 1, 2022 · 502efa7 · 502efa7
1 parent 9e19e1f
commit 502efa7
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 21 deletions.
diff --git a/hibernate-reactive-core/src/test/java/org/hibernate/reactive/containers/H2Database.java b/hibernate-reactive-core/src/test/java/org/hibernate/reactive/containers/H2Database.java
@@ -51,8 +51,8 @@ public class H2Database implements TestableDatabase {
 			expectedDBTypeForClass.put( byte.class, "TINYINT" );
 			expectedDBTypeForClass.put( Byte.class, "TINYINT" );
 			expectedDBTypeForClass.put( PrimitiveByteArrayTypeDescriptor.class, "BINARY VARYING" );
-			expectedDBTypeForClass.put( URL.class, "VARCHAR_IGNORECASE" );
-			expectedDBTypeForClass.put( TimeZone.class, "VARCHAR_IGNORECASE" );
+			expectedDBTypeForClass.put( URL.class, "CHARACTER VARYING" );
+			expectedDBTypeForClass.put( TimeZone.class, "CHARACTER VARYING" );
 			expectedDBTypeForClass.put( Date.class, "DATE" );
 			expectedDBTypeForClass.put( Timestamp.class, "TIMESTAMP" );
 			expectedDBTypeForClass.put( Time.class, "TIME" );
@@ -68,7 +68,7 @@ public class H2Database implements TestableDatabase {
 			expectedDBTypeForClass.put( Character.class, "VARCHAR_IGNORECASE" );
 			expectedDBTypeForClass.put( char.class, "VARCHAR_IGNORECASE" );
 			expectedDBTypeForClass.put( TextType.class, "text" );
-			expectedDBTypeForClass.put( String.class, "VARCHAR_IGNORECASE" );
+			expectedDBTypeForClass.put( String.class, "CHARACTER VARYING" );
 		}
 	}
 

diff --git a/hibernate-reactive-h2/build.gradle b/hibernate-reactive-h2/build.gradle
@@ -12,8 +12,6 @@ dependencies {
 
     // Dependencies for using H2 with Vert.x:
     implementation "io.vertx:vertx-jdbc-client:${vertxVersion}"
-    implementation 'io.agroal:agroal-api:1.12'
-    implementation 'io.agroal:agroal-pool:1.12'
 
     // Testing
     testImplementation 'org.assertj:assertj-core:3.20.2'

diff --git a/...reactive-h2/src/main/java/org/hibernate/reactive/pool/impl/H2ClientPoolConfiguration.java b/...reactive-h2/src/main/java/org/hibernate/reactive/pool/impl/H2ClientPoolConfiguration.java
@@ -7,20 +7,16 @@
 
 import java.net.URI;
 
-import io.vertx.jdbcclient.JDBCConnectOptions;
+import io.vertx.core.json.JsonObject;
 
 public class H2ClientPoolConfiguration extends DefaultSqlClientPoolConfiguration
 		implements JdbcClientPoolConfiguration {
 
 	@Override
-	public JDBCConnectOptions jdbcConnectOptions(URI uri) {
-
-		return new JDBCConnectOptions()
-				// H2 connection string
-				.setJdbcUrl( uri.toString() )
-				// username
-				.setUser( getUser() == null ? "SA" : getUser() )
-				// password
-				.setPassword( getPassword() );
+	public JsonObject jdbcConnectOptions(URI uri) {
+		return new JsonObject()
+				.put( "url", H2SqlClientPool.DEFAULT_URL )
+				.put( "user", "sa" )
+				.put( "pass", null );
 	}
 }
diff --git a/hibernate-reactive-h2/src/main/java/org/hibernate/reactive/pool/impl/H2SqlClientPool.java b/hibernate-reactive-h2/src/main/java/org/hibernate/reactive/pool/impl/H2SqlClientPool.java
@@ -33,7 +33,7 @@ public class H2SqlClientPool extends SqlClientPool
 
 	private static final Log LOG = LoggerFactory.make( Log.class, MethodHandles.lookup() );
 
-	private static final String DEFAULT_URL = "jdbc:h2:~/hreact;DATABASE_TO_UPPER=FALSE";
+	public static final String DEFAULT_URL = "jdbc:h2:~/hreact;DATABASE_TO_UPPER=FALSE";
 
 	//Asynchronous shutdown promise: we can't return it from #close as we implement a
 	//blocking interface.
@@ -84,7 +84,7 @@ protected Pool getPool() {
 	private Pool createPool(URI uri) {
 		JdbcClientPoolConfiguration configuration = serviceRegistry.getService( JdbcClientPoolConfiguration.class );
 		VertxInstance vertx = serviceRegistry.getService( VertxInstance.class );
-		return JDBCPool.pool( vertx.getVertx(), configuration.jdbcConnectOptions( uri ), configuration.poolOptions() );
+		return JDBCPool.pool( vertx.getVertx(), configuration.jdbcConnectOptions( uri ) );
 	}
 
 	@Override

diff --git a/...active-h2/src/main/java/org/hibernate/reactive/pool/impl/JdbcClientPoolConfiguration.java b/...active-h2/src/main/java/org/hibernate/reactive/pool/impl/JdbcClientPoolConfiguration.java
@@ -9,9 +9,8 @@
 
 import org.hibernate.service.Service;
 
-import io.vertx.jdbcclient.JDBCConnectOptions;
+import io.vertx.core.json.JsonObject;
 import io.vertx.sqlclient.PoolOptions;
-import io.vertx.sqlclient.SqlConnectOptions;
 
 public interface JdbcClientPoolConfiguration extends Service {
 	/**
@@ -20,12 +19,12 @@ public interface JdbcClientPoolConfiguration extends Service {
 	PoolOptions poolOptions();
 
 	/**
-	 * The {@link SqlConnectOptions} used to configure the {@code Pool}
+	 * The {@link JsonObject} used to configure the {@code Pool}
 	 *
 	 * @param uri A {@link URI} representing the JDBC URL or connection URI
 	 * specified in the configuration properties, usually via
 	 * {@link org.hibernate.cfg.Environment#JPA_JDBC_URL}, or
 	 * {@code null} if not specified.
 	 */
-	JDBCConnectOptions jdbcConnectOptions(URI uri);
+	JsonObject jdbcConnectOptions(URI uri);
 }