Re-enable detection of the database version by default when using exp…

…licit Hibernate ORM dialects Because that detection is now done by the Hibernate ORM dialect itself, and should work properly for all dialects.
quarkusio · Oct 8, 2024 · f22e634 · f22e634
1 parent 7db347e
commit f22e634
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 186 deletions.
diff --git a/docs/src/main/asciidoc/hibernate-orm.adoc b/docs/src/main/asciidoc/hibernate-orm.adoc
@@ -213,12 +213,6 @@ Hibernate ORM may generate SQL that is invalid which would lead to runtime excep
 If the database cannot be reached, a warning will be logged but startup will proceed.
 You can optionally disable the version check if you know the database won't be reachable on startup
 using <<quarkus-hibernate-orm_quarkus-hibernate-orm-database-version-check,`quarkus.hibernate-orm.database.version-check.enabled=false`>>.
-
-// TODO change the default to "always enabled" when we solve version detection problems
-//   See https://github.com/quarkusio/quarkus/issues/43703
-//   See https://github.com/quarkusio/quarkus/issues/42255
-The version is disabled by default when a dialect is set explicitly,
-as a workaround for https://github.com/quarkusio/quarkus/issues/42255[#42255]/link:https://github.com/quarkusio/quarkus/issues/43703[#43703].
 ====
 
 [[hibernate-dialect-other-databases]]

diff --git a/...s/hibernate/orm/config/dialect/DbVersionCheckDisabledAutomaticallyPersistenceXmlTest.java b/...s/hibernate/orm/config/dialect/DbVersionCheckDisabledAutomaticallyPersistenceXmlTest.java
diff --git a/...java/io/quarkus/hibernate/orm/config/dialect/DbVersionCheckDisabledAutomaticallyTest.java b/...java/io/quarkus/hibernate/orm/config/dialect/DbVersionCheckDisabledAutomaticallyTest.java
diff --git a/.../resources/META-INF/some-persistence-with-h2-version-placeholder-and-explicit-dialect.xml b/.../resources/META-INF/some-persistence-with-h2-version-placeholder-and-explicit-dialect.xml
diff --git a/.../main/java/io/quarkus/hibernate/orm/runtime/HibernateOrmRuntimeConfigPersistenceUnit.java b/.../main/java/io/quarkus/hibernate/orm/runtime/HibernateOrmRuntimeConfigPersistenceUnit.java
@@ -111,13 +111,10 @@ interface HibernateOrmConfigPersistenceUnitDatabase {
          *
          * @asciidoclet
          */
-        // TODO change the default to "always enabled" when we solve version detection problems
-        //   See https://github.com/quarkusio/quarkus/issues/43703
-        //   See https://github.com/quarkusio/quarkus/issues/42255
         // TODO disable the check by default when offline startup is opted in
         //   See https://github.com/quarkusio/quarkus/issues/13522
         @WithName("version-check.enabled")
-        @ConfigDocDefault("`true` if the dialect was set automatically by Quarkus, `false` if it was set explicitly")
+        @ConfigDocDefault("`true`")
         Optional<Boolean> versionCheckEnabled();
     }
 

diff --git a/...a/io/quarkus/hibernate/orm/runtime/service/QuarkusRuntimeInitDialectFactoryInitiator.java b/...a/io/quarkus/hibernate/orm/runtime/service/QuarkusRuntimeInitDialectFactoryInitiator.java
@@ -33,12 +33,9 @@ public QuarkusRuntimeInitDialectFactoryInitiator(String persistenceUnitName,
         // then the version from `DialectVersions.Defaults` will be used:
         this.buildTimeDbVersion = dialect.getVersion();
         this.versionCheckEnabled = runtimePuConfig.database().versionCheckEnabled()
-                // TODO change the default to "always enabled" when we solve version detection problems
-                //   See https://github.com/quarkusio/quarkus/issues/43703
-                //   See https://github.com/quarkusio/quarkus/issues/42255
                 // TODO disable the check by default when offline startup is opted in
                 //   See https://github.com/quarkusio/quarkus/issues/13522
-                .orElse(recordedConfig.getExplicitDialect().isEmpty());
+                .orElse(true);
     }
 
     @Override