Skip to content

Commit 4c5b0a5

Browse files
committed
Re-enable detection of the database version by default when using explicit Hibernate ORM dialects
Because that detection is now done by the Hibernate ORM dialect itself, and should work properly for all dialects.
1 parent 161fe0d commit 4c5b0a5

File tree

6 files changed

+2
-186
lines changed

6 files changed

+2
-186
lines changed

docs/src/main/asciidoc/hibernate-orm.adoc

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -213,12 +213,6 @@ Hibernate ORM may generate SQL that is invalid which would lead to runtime excep
213213
If the database cannot be reached, a warning will be logged but startup will proceed.
214214
You can optionally disable the version check if you know the database won't be reachable on startup
215215
using <<quarkus-hibernate-orm_quarkus-hibernate-orm-database-version-check-enabled,`quarkus.hibernate-orm.database.version-check.enabled=false`>>.
216-
217-
// TODO change the default to "always enabled" when we solve version detection problems
218-
// See https://github.com/quarkusio/quarkus/issues/43703
219-
// See https://github.com/quarkusio/quarkus/issues/42255
220-
The version check is disabled by default when a dialect is set explicitly,
221-
as a workaround for https://github.com/quarkusio/quarkus/issues/42255[#42255]/link:https://github.com/quarkusio/quarkus/issues/43703[#43703].
222216
====
223217

224218
[[hibernate-dialect-other-databases]]

extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/config/dialect/DbVersionCheckDisabledAutomaticallyPersistenceXmlTest.java

Lines changed: 0 additions & 73 deletions
This file was deleted.

extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/config/dialect/DbVersionCheckDisabledAutomaticallyTest.java

Lines changed: 0 additions & 69 deletions
This file was deleted.

extensions/hibernate-orm/deployment/src/test/resources/META-INF/some-persistence-with-h2-version-placeholder-and-explicit-dialect.xml

Lines changed: 0 additions & 30 deletions
This file was deleted.

extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/HibernateOrmRuntimeConfigPersistenceUnit.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,13 +107,10 @@ interface HibernateOrmConfigPersistenceUnitDatabase {
107107
*
108108
* @asciidoclet
109109
*/
110-
// TODO change the default to "always enabled" when we solve version detection problems
111-
// See https://github.com/quarkusio/quarkus/issues/43703
112-
// See https://github.com/quarkusio/quarkus/issues/42255
113110
// TODO disable the check by default when offline startup is opted in
114111
// See https://github.com/quarkusio/quarkus/issues/13522
115112
@WithName("version-check.enabled")
116-
@ConfigDocDefault("`true` if the dialect was set automatically by Quarkus, `false` if it was set explicitly")
113+
@ConfigDocDefault("`true`")
117114
Optional<Boolean> versionCheckEnabled();
118115
}
119116

extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/service/QuarkusRuntimeInitDialectFactoryInitiator.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,9 @@ public QuarkusRuntimeInitDialectFactoryInitiator(String persistenceUnitName,
3333
// then the version from `DialectVersions.Defaults` will be used:
3434
this.buildTimeDbVersion = dialect.getVersion();
3535
this.versionCheckEnabled = runtimePuConfig.database().versionCheckEnabled()
36-
// TODO change the default to "always enabled" when we solve version detection problems
37-
// See https://github.com/quarkusio/quarkus/issues/43703
38-
// See https://github.com/quarkusio/quarkus/issues/42255
3936
// TODO disable the check by default when offline startup is opted in
4037
// See https://github.com/quarkusio/quarkus/issues/13522
41-
.orElse(recordedConfig.getExplicitDialect().isEmpty());
38+
.orElse(true);
4239
}
4340

4441
@Override

0 commit comments

Comments
 (0)