WIP - Try to remove what gets in the way of Hibernate Reactive checking the DB version

Author: yrodiere

extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/FastBootHibernateReactivePersistenceProvider.java

@@ -179,6 +179,9 @@ private EntityManagerFactoryBuilder getEntityManagerFactoryBuilderOrNull(String
                 }
             }
 
+            // Allow detection of driver/database capabilities on runtime init (was disabled during static init)
+            runtimeSettingsBuilder.put("hibernate.boot.allow_jdbc_metadata_access", "true");
+
             if (!puConfig.unsupportedProperties().isEmpty()) {
                 log.warnf("Persistence-unit [%s] sets unsupported properties."
                         + " These properties may not work correctly, and even if they do,"

extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/boot/registry/PreconfiguredReactiveServiceRegistryBuilder.java

@@ -24,6 +24,7 @@
 import org.hibernate.reactive.engine.jdbc.mutation.internal.ReactiveMutationExecutorServiceInitiator;
 import org.hibernate.reactive.loader.ast.internal.ReactiveBatchLoaderFactoryInitiator;
 import org.hibernate.reactive.provider.service.NativeParametersHandling;
+import org.hibernate.reactive.provider.service.NoJdbcEnvironmentInitiator;
 import org.hibernate.reactive.provider.service.NoJtaPlatformInitiator;
 import org.hibernate.reactive.provider.service.ReactiveMarkerServiceInitiator;
 import org.hibernate.reactive.provider.service.ReactivePersisterClassResolverInitiator;
@@ -53,7 +54,6 @@
 import io.quarkus.hibernate.orm.runtime.service.bytecodeprovider.QuarkusRuntimeBytecodeProviderInitiator;
 import io.quarkus.hibernate.reactive.runtime.customized.CheckingVertxContextInitiator;
 import io.quarkus.hibernate.reactive.runtime.customized.QuarkusNoJdbcConnectionProviderInitiator;
-import io.quarkus.hibernate.reactive.runtime.customized.QuarkusNoJdbcEnvironmentInitiator;
 
 /**
  * Helps to instantiate a ServiceRegistryBuilder from a previous state. This
@@ -189,8 +189,7 @@ private static List<StandardServiceInitiator<?>> buildQuarkusServiceInitiatorLis
         // TODO disable?
         serviceInitiators.add(SchemaManagementToolInitiator.INSTANCE);
 
-        // Replaces JdbcEnvironmentInitiator.INSTANCE :
-        serviceInitiators.add(new QuarkusNoJdbcEnvironmentInitiator(rs.getDialect()));
+        serviceInitiators.add(NoJdbcEnvironmentInitiator.INSTANCE);
 
         // Custom one!
         serviceInitiators.add(QuarkusJndiServiceInitiator.INSTANCE);

extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/customized/QuarkusNoJdbcEnvironmentInitiator.java

@@ -3,9 +3,7 @@
 import java.util.Map;
 
 import org.hibernate.boot.registry.StandardServiceInitiator;
-import org.hibernate.engine.jdbc.spi.JdbcServices;
 import org.hibernate.reactive.pool.ReactiveConnectionPool;
-import org.hibernate.reactive.pool.impl.ExternalSqlClientPool;
 import org.hibernate.service.spi.ServiceRegistryImplementor;
 
 import io.quarkus.hibernate.orm.runtime.migration.MultiTenancyStrategy;
@@ -33,8 +31,7 @@ public ReactiveConnectionPool initiateService(Map configurationValues, ServiceRe
             // nothing to do, but given the separate hierarchies have to handle this here.
             return null;
         }
-        final JdbcServices jdbcService = registry.getService(JdbcServices.class);
-        return new ExternalSqlClientPool(pool, jdbcService.getSqlStatementLogger(), jdbcService.getSqlExceptionHelper());
+        return new QuarkusSqlClientPool(pool);
     }
 
 }

extensions/hibernate-reactive/runtime/src/main/java/io/quarkus/hibernate/reactive/runtime/customized/QuarkusReactiveConnectionPoolInitiator.java

@@ -0,0 +1,62 @@
+package io.quarkus.hibernate.reactive.runtime.customized;
+
+import java.util.concurrent.CompletionStage;
+
+import org.hibernate.engine.jdbc.spi.JdbcServices;
+import org.hibernate.engine.jdbc.spi.SqlExceptionHelper;
+import org.hibernate.engine.jdbc.spi.SqlStatementLogger;
+import org.hibernate.reactive.pool.impl.SqlClientPool;
+import org.hibernate.reactive.util.impl.CompletionStages;
+import org.hibernate.service.spi.ServiceRegistryAwareService;
+import org.hibernate.service.spi.ServiceRegistryImplementor;
+
+import io.vertx.sqlclient.Pool;
+
+/**
+ * An alternative implementation of {@link org.hibernate.reactive.pool.impl.ExternalSqlClientPool}
+ * which retrieves SQL loggers / exception handlers lazily,
+ * to avoid a circular dependency JdbcEnvironment => pool => JdbcServices => JdbcEnvironment.
+ */
+public class QuarkusSqlClientPool extends SqlClientPool
+        implements ServiceRegistryAwareService {
+
+    private final Pool pool;
+    private SqlStatementLogger sqlStatementLogger;
+    private SqlExceptionHelper sqlExceptionHelper;
+    private ServiceRegistryImplementor serviceRegistry;
+
+    public QuarkusSqlClientPool(Pool pool) {
+        this.pool = pool;
+    }
+
+    @Override
+    public void injectServices(ServiceRegistryImplementor serviceRegistry) {
+        this.serviceRegistry = serviceRegistry;
+        this.sqlStatementLogger = serviceRegistry.getService(SqlStatementLogger.class);
+    }
+
+    @Override
+    protected Pool getPool() {
+        return pool;
+    }
+
+    @Override
+    protected SqlStatementLogger getSqlStatementLogger() {
+        return sqlStatementLogger;
+    }
+
+    @Override
+    public SqlExceptionHelper getSqlExceptionHelper() {
+        if (sqlExceptionHelper == null) {
+            sqlExceptionHelper = serviceRegistry
+                    .getService(JdbcServices.class).getSqlExceptionHelper();
+        }
+        return sqlExceptionHelper;
+    }
+
+    @Override
+    public CompletionStage<Void> getCloseFuture() {
+        // Closing is handled by Quarkus.
+        return CompletionStages.voidFuture();
+    }
+}