Force the default version of all supported Hibernate ORM dialects

Author: yrodiere

extensions/datasource/runtime/src/main/java/io/quarkus/datasource/runtime/DataSourceBuildTimeConfig.java

@@ -41,7 +41,7 @@ public class DataSourceBuildTimeConfig {
      * or simply a warning in case the database cannot be reached.
      *
      * The default for this property is specific to each extension;
-     * the Hibernate ORM extension will default to the oldest version it supports.
+     * the Hibernate ORM extension will default to the oldest version supported in Quarkus.
      *
      * @asciidoclet
      */

extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmProcessor.java

@@ -178,9 +178,9 @@ public final class HibernateOrmProcessor {
     void registerHibernateOrmMetadataForCoreDialects(
             BuildProducer<DatabaseKindDialectBuildItem> producer) {
         producer.produce(new DatabaseKindDialectBuildItem(DatabaseKind.DB2,
-                "org.hibernate.dialect.DB2Dialect"));
+                "org.hibernate.dialect.DB2Dialect", DialectVersions.Defaults.DB2));
         producer.produce(new DatabaseKindDialectBuildItem(DatabaseKind.DERBY,
-                "org.hibernate.dialect.DerbyDialect"));
+                "org.hibernate.dialect.DerbyDialect", DialectVersions.Defaults.DERBY));
         producer.produce(new DatabaseKindDialectBuildItem(DatabaseKind.H2,
                 // Using our own default version is extra important for H2
                 // See https://github.com/quarkusio/quarkus/issues/1886
@@ -194,7 +194,7 @@ void registerHibernateOrmMetadataForCoreDialects(
         producer.produce(new DatabaseKindDialectBuildItem(DatabaseKind.ORACLE,
                 "org.hibernate.dialect.OracleDialect", DialectVersions.Defaults.ORACLE));
         producer.produce(new DatabaseKindDialectBuildItem(DatabaseKind.POSTGRESQL,
-                "org.hibernate.dialect.PostgreSQLDialect"));
+                "org.hibernate.dialect.PostgreSQLDialect", DialectVersions.Defaults.POSTGRESQL));
     }
 
     @BuildStep

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

@@ -16,10 +16,13 @@ public final class DialectVersions {
     public static final class Defaults {
 
         // The following constants must be at least equal to the default dialect version in Hibernate ORM
+        public static final String DB2 = "10.5";
+        public static final String DERBY = "10.14";
         public static final String MARIADB = "10.6";
         public static final String MSSQL = "13"; // 2016
         public static final String MYSQL = "8";
         public static final String ORACLE = "12";
+        public static final String POSTGRESQL = "10.0";
 
         // This must be aligned on the H2 version in the Quarkus BOM
         public static final String H2 = "2.1.210";

integration-tests/jpa-db2/src/main/java/io/quarkus/it/jpa/db2/DialectEndpoint.java

@@ -0,0 +1,44 @@
+package io.quarkus.it.jpa.db2;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+
+import jakarta.inject.Inject;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import org.hibernate.SessionFactory;
+import org.hibernate.engine.spi.SessionFactoryImplementor;
+
+import io.quarkus.hibernate.orm.runtime.config.DialectVersions;
+
+@WebServlet(name = "DialectEndpoint", urlPatterns = "/dialect/version")
+public class DialectEndpoint extends HttpServlet {
+    @Inject
+    SessionFactory sessionFactory;
+
+    @Override
+    protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
+        try {
+            var version = sessionFactory.unwrap(SessionFactoryImplementor.class).getJdbcServices().getDialect().getVersion();
+            resp.getWriter().write(DialectVersions.toString(version));
+        } catch (Exception e) {
+            reportException("Failed to retrieve dialect version", e, resp);
+        }
+    }
+
+    private void reportException(String errorMessage, final Exception e, final HttpServletResponse resp) throws IOException {
+        final PrintWriter writer = resp.getWriter();
+        if (errorMessage != null) {
+            writer.write(errorMessage);
+            writer.write(" ");
+        }
+        writer.write(e.toString());
+        writer.append("\n\t");
+        e.printStackTrace(writer);
+        writer.append("\n\t");
+    }
+
+}

integration-tests/jpa-db2/src/test/java/io/quarkus/it/jpa/db2/DialectInGraalITCase.java

@@ -0,0 +1,11 @@
+package io.quarkus.it.jpa.db2;
+
+import io.quarkus.test.junit.QuarkusIntegrationTest;
+
+/**
+ * DialectTest, but in native mode.
+ */
+@QuarkusIntegrationTest
+public class DialectInGraalITCase extends DialectTest {
+
+}

integration-tests/jpa-db2/src/test/java/io/quarkus/it/jpa/db2/DialectTest.java

@@ -0,0 +1,27 @@
+package io.quarkus.it.jpa.db2;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.hibernate.orm.runtime.config.DialectVersions;
+import io.quarkus.test.junit.QuarkusTest;
+import io.restassured.RestAssured;
+
+/**
+ * Test the dialect used by default in Quarkus.
+ */
+@QuarkusTest
+public class DialectTest {
+
+    /**
+     * This is important for backwards compatibility reasons:
+     * we want to keep using at least the same version as before by default.
+     */
+    @Test
+    public void version() {
+        String version = RestAssured.when().get("/dialect/version").then().extract().body().asString();
+        assertThat(version).startsWith(DialectVersions.DB2);
+    }
+
+}

integration-tests/jpa-derby/src/main/java/io/quarkus/it/jpa/derby/DialectEndpoint.java

@@ -0,0 +1,44 @@
+package io.quarkus.it.jpa.derby;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+
+import jakarta.inject.Inject;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import org.hibernate.SessionFactory;
+import org.hibernate.engine.spi.SessionFactoryImplementor;
+
+import io.quarkus.hibernate.orm.runtime.config.DialectVersions;
+
+@WebServlet(name = "DialectEndpoint", urlPatterns = "/dialect/version")
+public class DialectEndpoint extends HttpServlet {
+    @Inject
+    SessionFactory sessionFactory;
+
+    @Override
+    protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
+        try {
+            var version = sessionFactory.unwrap(SessionFactoryImplementor.class).getJdbcServices().getDialect().getVersion();
+            resp.getWriter().write(DialectVersions.toString(version));
+        } catch (Exception e) {
+            reportException("Failed to retrieve dialect version", e, resp);
+        }
+    }
+
+    private void reportException(String errorMessage, final Exception e, final HttpServletResponse resp) throws IOException {
+        final PrintWriter writer = resp.getWriter();
+        if (errorMessage != null) {
+            writer.write(errorMessage);
+            writer.write(" ");
+        }
+        writer.write(e.toString());
+        writer.append("\n\t");
+        e.printStackTrace(writer);
+        writer.append("\n\t");
+    }
+
+}

integration-tests/jpa-derby/src/test/java/io/quarkus/it/jpa/derby/DialectInGraalITCase.java

@@ -0,0 +1,11 @@
+package io.quarkus.it.jpa.derby;
+
+import io.quarkus.test.junit.QuarkusIntegrationTest;
+
+/**
+ * DialectTest, but in native mode.
+ */
+@QuarkusIntegrationTest
+public class DialectInGraalITCase extends DialectTest {
+
+}

integration-tests/jpa-derby/src/test/java/io/quarkus/it/jpa/derby/DialectTest.java

@@ -0,0 +1,27 @@
+package io.quarkus.it.jpa.derby;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.hibernate.orm.runtime.config.DialectVersions;
+import io.quarkus.test.junit.QuarkusTest;
+import io.restassured.RestAssured;
+
+/**
+ * Test the dialect used by default in Quarkus.
+ */
+@QuarkusTest
+public class DialectTest {
+
+    /**
+     * This is important for backwards compatibility reasons:
+     * we want to keep using at least the same version as before by default.
+     */
+    @Test
+    public void version() {
+        String version = RestAssured.when().get("/dialect/version").then().extract().body().asString();
+        assertThat(version).startsWith(DialectVersions.DERBY);
+    }
+
+}

integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/DialectEndpoint.java

@@ -0,0 +1,44 @@
+package io.quarkus.it.jpa.postgresql;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+
+import jakarta.inject.Inject;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import org.hibernate.SessionFactory;
+import org.hibernate.engine.spi.SessionFactoryImplementor;
+
+import io.quarkus.hibernate.orm.runtime.config.DialectVersions;
+
+@WebServlet(name = "DialectEndpoint", urlPatterns = "/dialect/version")
+public class DialectEndpoint extends HttpServlet {
+    @Inject
+    SessionFactory sessionFactory;
+
+    @Override
+    protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
+        try {
+            var version = sessionFactory.unwrap(SessionFactoryImplementor.class).getJdbcServices().getDialect().getVersion();
+            resp.getWriter().write(DialectVersions.toString(version));
+        } catch (Exception e) {
+            reportException("Failed to retrieve dialect version", e, resp);
+        }
+    }
+
+    private void reportException(String errorMessage, final Exception e, final HttpServletResponse resp) throws IOException {
+        final PrintWriter writer = resp.getWriter();
+        if (errorMessage != null) {
+            writer.write(errorMessage);
+            writer.write(" ");
+        }
+        writer.write(e.toString());
+        writer.append("\n\t");
+        e.printStackTrace(writer);
+        writer.append("\n\t");
+    }
+
+}