upgrade hibernate tests to 6.2.38 (#1467)

sergiyvamz · web-flow · commit 42d5b87fb50d · 2025-07-09T10:22:20.000-07:00
diff --git a/.github/workflows/run-hibernate-orm-tests.yml b/.github/workflows/run-hibernate-orm-tests.yml
@@ -61,3 +61,10 @@ jobs:
           name: html-summary-report
           path: ./wrapper/build/report
           retention-days: 5
+      - name: 'Archive container reports'
+        if: ${{steps.changed-files.outputs.ONLY_DOCS && steps.changed-files.outputs.ONLY_DOCS == 'false' && !cancelled()}}
+        uses: actions/upload-artifact@v4
+        with:
+          name: container-reports
+          path: ./wrapper/build/test-results/*.tar.gz
+          retention-days: 5
diff --git a/wrapper/src/test/java/integration/host/TestEnvironment.java b/wrapper/src/test/java/integration/host/TestEnvironment.java
@@ -74,7 +74,7 @@ public class TestEnvironment implements AutoCloseable {
   private static final String PROXIED_DOMAIN_NAME_SUFFIX = ".proxied";
   protected static final int PROXY_CONTROL_PORT = 8474;
   protected static final int PROXY_PORT = 8666;
-  private static final String HIBERNATE_VERSION = "6.2.0.CR2";
+  private static final String HIBERNATE_VERSION = "6.2.38";
 
   private static final TestEnvironmentConfiguration config = new TestEnvironmentConfiguration();
   private static final boolean USE_OTLP_CONTAINER_FOR_TRACES = true;
@@ -1085,18 +1085,21 @@ private static void createTestContainer(TestEnvironment env) {
                   "aws/rds-test-container",
                   getContainerBaseImageName(env.info.getRequest()),
                   builder -> builder
+                      .run("apk", "add", "--no-cache", "--upgrade", "bash")
                       .run("apk", "add", "git")
                       .run("git", "clone", "--depth", "1", "--branch", HIBERNATE_VERSION,
-                          "https://github.com/hibernate/hibernate-orm.git", "/app/hibernate-orm"))
+                          "https://github.com/hibernate/hibernate-orm.git", "/app/hibernate-orm")
+                      .run("rm -f /app/libs/*-bundle-*.jar")
+                      .run("rm -f /app/hibernate-orm/drivers/*-bundle-*.jar"))
+              .withCopyFileToContainer(MountableFile.forHostPath("./build/libs"),
+                  "app/hibernate-orm/drivers")
               .withCopyFileToContainer(MountableFile.forHostPath(
                       "src/test/resources/hibernate_files/databases.gradle"),
                   "app/hibernate-orm/gradle/databases.gradle")
               .withCopyFileToContainer(MountableFile.forHostPath(
-                      "src/test/resources/hibernate_files/hibernate-core.gradle"),
-                  "hibernate-core/hibernate-core.gradle")
-              .withCopyFileToContainer(MountableFile.forHostPath(
-                      "src/test/resources/hibernate_files/java-module.gradle"),
-                  "app/hibernate-orm/gradle/java-module.gradle")
+                      "src/test/resources/hibernate_files/PostgresIntervalSecondTest.java"),
+                  "app/hibernate-orm/hibernate-core/src/test/java/org/hibernate/orm/test/type/"
+                    + "PostgresIntervalSecondTest.java")
               .withCopyFileToContainer(MountableFile.forHostPath(
                       "src/test/resources/hibernate_files/collect_test_results.sh"),
                   "app/collect_test_results.sh");
@@ -1320,7 +1323,9 @@ private String[] buildHibernateCommands(boolean debugMode) {
         "-DdbUser=" + dbInfo.getUsername(),
         "-DdbPass=" + dbInfo.getPassword(),
         "-DdbName=" + dbInfo.getDefaultDbName(),
-        "--no-parallel", "--no-daemon"
+        "--no-parallel",
+        "--no-daemon",
+        "--no-build-cache"
     ));
 
     if (debugMode) {
@@ -1329,13 +1334,11 @@ private String[] buildHibernateCommands(boolean debugMode) {
 
     switch (this.info.getRequest().getDatabaseEngine()) {
       case PG:
-        command.add("-Pdb=amazon_ci");
-        command.add("-PexcludeTests=PostgreSQLSkipAutoCommitTest");
+        command.add("-Pdb=pg_amazon_ci");
         break;
       case MYSQL:
       default:
-        command.add("-Pdb=amazon_mysql_ci");
-        command.add("-PexcludeTests=MySQLSkipAutoCommitTest");
+        command.add("-Pdb=mysql_amazon_ci");
         break;
     }
     return command.toArray(new String[] {});
diff --git a/wrapper/src/test/resources/hibernate_files/PostgresIntervalSecondTest.java b/wrapper/src/test/resources/hibernate_files/PostgresIntervalSecondTest.java
@@ -0,0 +1,100 @@
+package org.hibernate.orm.test.type;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.time.Duration;
+
+import org.hibernate.annotations.JdbcTypeCode;
+import org.hibernate.cfg.AvailableSettings;
+import org.hibernate.dialect.PostgreSQLDialect;
+import org.hibernate.dialect.PostgreSQLIntervalSecondJdbcType;
+import org.hibernate.metamodel.spi.MappingMetamodelImplementor;
+import org.hibernate.persister.entity.EntityPersister;
+import org.hibernate.type.SqlTypes;
+import org.hibernate.type.descriptor.jdbc.JdbcType;
+import org.hibernate.type.descriptor.jdbc.NumericJdbcType;
+import org.hibernate.type.descriptor.jdbc.spi.JdbcTypeRegistry;
+
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.RequiresDialect;
+import org.hibernate.testing.orm.junit.ServiceRegistry;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.Setting;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+
+/**
+ * Test to see if using `@org.hibernate.annotations.JdbcTypeCode` or `@org.hibernate.annotations.JdbcType`
+ * will override a default JdbcType set by a {@link AvailableSettings#PREFERRED_DURATION_JDBC_TYPE config property}.
+ */
+@SessionFactory
+@DomainModel(annotatedClasses = { PostgresIntervalSecondTest.EntityWithIntervalSecondDuration.class })
+@ServiceRegistry(settings = @Setting(name = AvailableSettings.PREFERRED_DURATION_JDBC_TYPE, value = "NUMERIC"))
+@RequiresDialect(PostgreSQLDialect.class)
+@Disabled
+public class PostgresIntervalSecondTest {
+
+  @Test
+  public void verifyMappings(SessionFactoryScope scope) {
+    final MappingMetamodelImplementor mappingMetamodel = scope.getSessionFactory()
+        .getRuntimeMetamodels()
+        .getMappingMetamodel();
+    final EntityPersister entityDescriptor = mappingMetamodel.findEntityDescriptor(
+        PostgresIntervalSecondTest.EntityWithIntervalSecondDuration.class );
+    final JdbcTypeRegistry jdbcTypeRegistry = mappingMetamodel.getTypeConfiguration().getJdbcTypeRegistry();
+
+    final JdbcType durationJdbcType = mappingMetamodel.getTypeConfiguration()
+        .getBasicTypeForJavaType( Duration.class )
+        .getJdbcType();
+
+    // default interval type set by a config property and should be `NUMERIC`
+    assertThat( durationJdbcType ).isEqualTo( NumericJdbcType.INSTANCE );
+
+    final JdbcType intervalType = jdbcTypeRegistry.getDescriptor( SqlTypes.INTERVAL_SECOND );
+    assertThat( intervalType ).isOfAnyClassIn( PostgreSQLIntervalSecondJdbcType.class );
+
+    // a simple duration field with no overrides - so should be using a default JdbcType
+    assertThat( entityDescriptor.findAttributeMapping( "duration" )
+        .getSingleJdbcMapping().getJdbcType() )
+        .isEqualTo( durationJdbcType );
+
+    // a field that is using a @JdbcType annotation to override the JdbcType. Hence, the used JdbcType must match the one
+    // set by the annotation.
+    assertThat( entityDescriptor.findAttributeMapping( "durationJdbcType" )
+        .getSingleJdbcMapping().getJdbcType() )
+        .isNotEqualTo( durationJdbcType )
+        .isOfAnyClassIn( PostgreSQLIntervalSecondJdbcType.class );
+
+    // a field that is using a @JdbcTypeCode annotation to override the JdbcType. Hence, the used JdbcType must match the one
+    // set by the annotation.
+    assertThat( entityDescriptor.findAttributeMapping( "durationJdbcTypeCode" )
+        .getSingleJdbcMapping().getJdbcType() )
+        .isEqualTo( intervalType );
+  }
+
+  @Entity(name = "EntityWithIntervalSecondDuration")
+  @Table(name = "EntityWithIntervalSecondDuration")
+  public static class EntityWithIntervalSecondDuration {
+    @Id
+    private Integer id;
+
+    private Duration duration;
+
+    @Column(precision = 10, scale = 6)
+    @JdbcTypeCode(SqlTypes.INTERVAL_SECOND)
+    private Duration durationJdbcTypeCode;
+
+    @Column(precision = 10, scale = 6)
+    @org.hibernate.annotations.JdbcType(PostgreSQLIntervalSecondJdbcType.class)
+    private Duration durationJdbcType;
+
+    public EntityWithIntervalSecondDuration() {
+    }
+  }
+}
diff --git a/wrapper/src/test/resources/hibernate_files/collect_test_results.sh b/wrapper/src/test/resources/hibernate_files/collect_test_results.sh
@@ -1,3 +1,4 @@
 #!/bin/sh
 
-find /app/hibernate-orm/*/target/reports/tests -type d -name test -print0 | tar -czvf  "/app/build/test-results/hibernate-orm_$(date '+%Y-%m-%d_%H-%M-%S').tar.gz" --files-from -
+find /app/hibernate-orm/*/target/reports/tests -type d -name test -print0 | tar -czvf  "/app/build/test-results/hibernate-orm-reports_$(date '+%Y-%m-%d_%H-%M-%S').tar.gz" --files-from -
+find /app/hibernate-orm/*/target/test-results/test -type d -name test -print0 | tar -czvf  "/app/build/test-results/hibernate-orm-test-results_$(date '+%Y-%m-%d_%H-%M-%S').tar.gz" --files-from -
diff --git a/wrapper/src/test/resources/hibernate_files/databases.gradle b/wrapper/src/test/resources/hibernate_files/databases.gradle
@@ -15,16 +15,17 @@ ext {
     dbUser = System.getProperty( 'dbUser', 'hibernate_orm_test' )
     dbPass = System.getProperty( 'dbPass', 'hibernate_orm_test' )
     dbName = System.getProperty( 'dbName', 'hibernate_orm_test' )
+    runID = System.getProperty( 'runID', '' )
     dbBundle = [
-            amazon_ci : [
+            pg_amazon_ci : [
                     'db.dialect' : 'org.hibernate.dialect.PostgreSQLDialect',
                     'jdbc.driver': 'software.amazon.jdbc.Driver',
                     'jdbc.user'  : dbUser,
                     'jdbc.pass'  : dbPass,
                     'jdbc.url'   : 'jdbc:aws-wrapper:postgresql://' + dbHost + '/' + dbName + '?preparedStatementCacheQueries=0&escapeSyntaxCallMode=callIfNoReturn&wrapperPlugins=',
                     'connection.init_sql' : ''
             ],
-            amazon_mysql_ci : [
+            mysql_amazon_ci : [
                     'db.dialect' : 'org.hibernate.dialect.MySQLDialect',
                     'jdbc.driver': 'software.amazon.jdbc.Driver',
                     'jdbc.user'  : dbUser,
@@ -37,8 +38,9 @@ ext {
                     'jdbc.driver': 'org.h2.Driver',
                     'jdbc.user'  : 'sa',
                     'jdbc.pass'  : '',
-                    'jdbc.url'   : 'jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1;LOCK_TIMEOUT=10000',
-                    'connection.init_sql' : ''
+                    'jdbc.url'   : 'jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE',
+                    'connection.init_sql' : '',
+                    'hibernate.dialect.native_param_markers' : 'true'
             ],
             hsqldb : [
                     'db.dialect' : 'org.hibernate.dialect.HSQLDialect',
@@ -53,15 +55,15 @@ ext {
                     'jdbc.driver': 'org.apache.derby.iapi.jdbc.AutoloadedDriver',
                     'jdbc.user'  : 'hibernate_orm_test',
                     'jdbc.pass'  : 'hibernate_orm_test',
-                    'jdbc.url'   : 'jdbc:derby:target/tmp/derby/hibernate_orm_test;databaseName=hibernate_orm_test;create=true',
+                    'jdbc.url'   : 'jdbc:derby:memory:;databaseName=hibernate_orm_test;create=true',
                     'connection.init_sql' : ''
             ],
             derby_old : [
                     'db.dialect' : 'org.hibernate.dialect.DerbyDialect',
                     'jdbc.driver': 'org.apache.derby.jdbc.EmbeddedDriver',
                     'jdbc.user'  : 'hibernate_orm_test',
                     'jdbc.pass'  : 'hibernate_orm_test',
-                    'jdbc.url'   : 'jdbc:derby:target/tmp/derby/hibernate_orm_test;databaseName=hibernate_orm_test;create=true',
+                    'jdbc.url'   : 'jdbc:derby:memory:;databaseName=hibernate_orm_test;create=true',
                     'connection.init_sql' : ''
             ],
             pgsql : [
@@ -97,9 +99,18 @@ ext {
                     'jdbc.user'  : 'hibernate_orm_test',
                     'jdbc.pass'  : 'hibernate_orm_test',
                     // Disable prepared statement caching to avoid issues with changing schemas
-                    'jdbc.url'   : 'jdbc:jtds:sybase://' + dbHost + ':5000/hibernate_orm_test;maxStatements=0;cacheMetaData=false',
+                    'jdbc.url'   : 'jdbc:jtds:sybase://' + dbHost + ':9000/hibernate_orm_test;maxStatements=0;cacheMetaData=false',
                     'connection.init_sql' : 'set ansinull on'
             ],
+            sybase_jconn_ci : [
+                    'db.dialect' : 'org.hibernate.dialect.SybaseASEDialect',
+                    'jdbc.driver': 'com.sybase.jdbc4.jdbc.SybDriver',
+                    'jdbc.user'  : 'hibernate_orm_test',
+                    'jdbc.pass'  : 'hibernate_orm_test',
+                    // Disable prepared statement caching to avoid issues with changing schemas
+                    'jdbc.url'   : 'jdbc:sybase:Tds:' + dbHost + ':9000/hibernate_orm_test',
+                    'connection.init_sql' : 'set ansinull on set quoted_identifier on'
+            ],
             mysql : [
                     'db.dialect' : 'org.hibernate.dialect.MySQLDialect',
                     'jdbc.driver': 'com.mysql.cj.jdbc.Driver',
@@ -137,7 +148,7 @@ ext {
                     'jdbc.driver': 'com.mysql.jdbc.Driver',
                     'jdbc.user'  : 'hibernate_orm_test',
                     'jdbc.pass'  : 'hibernate_orm_test',
-                    'jdbc.url'   : 'jdbc:mysql://' + dbHost + '/hibernate_orm_test',
+                    'jdbc.url'   : 'jdbc:mysql://' + dbHost + ':4000/hibernate_orm_test',
                     'connection.init_sql' : ''
             ],
             oracle : [
@@ -149,6 +160,14 @@ ext {
                     'connection.init_sql' : ''
             ],
             oracle_ci : [
+                    'db.dialect' : 'org.hibernate.dialect.OracleDialect',
+                    'jdbc.driver': 'oracle.jdbc.OracleDriver',
+                    'jdbc.user'  : 'hibernate_orm_test',
+                    'jdbc.pass'  : 'hibernate_orm_test',
+                    'jdbc.url'   : 'jdbc:oracle:thin:@' + dbHost + ':1521/freepdb1',
+                    'connection.init_sql' : ''
+            ],
+            oracle_xe_ci : [
                     'db.dialect' : 'org.hibernate.dialect.OracleDialect',
                     'jdbc.driver': 'oracle.jdbc.OracleDriver',
                     'jdbc.user'  : 'hibernate_orm_test',
@@ -168,13 +187,49 @@ ext {
             oracle_cloud_autonomous_tls : [
                     'db.dialect' : 'org.hibernate.dialect.OracleDialect',
                     'jdbc.driver': 'oracle.jdbc.OracleDriver',
-                    'jdbc.user'  : 'hibernate_orm_test',
+                    'jdbc.user'  : 'hibernate_orm_test_' + runID,
                     'jdbc.pass'  : 'Oracle_19_Password',
                     // Requires dbHost (pointing to the right cloud region) AND dbService (unique database name).
                     //
                     // To avoid hibernate-spatial tests failure, JVM must be enabled as stated in documentation:
                     // https://docs.oracle.com/en/cloud/paas/autonomous-database/adbsa/autonomous-oracle-java.html
-                    'jdbc.url'   : 'jdbc:oracle:thin:@(description=(retry_count=20)(retry_delay=3)(address=(protocol=tcps)(port=1521)(host=' + dbHost + '.oraclecloud.com))(connect_data=(service_name=' + dbService + '_low.adb.oraclecloud.com))(security=(ssl_server_dn_match=yes)))',
+                    'jdbc.url'   : 'jdbc:oracle:thin:@(description=(retry_count=5)(retry_delay=1)(address=(protocol=tcps)(port=1521)(host=' + dbHost + '.oraclecloud.com))(connect_data=(service_name=' + dbService + '_tp.adb.oraclecloud.com))(security=(ssl_server_dn_match=no)))?oracle.jdbc.enableQueryResultCache=false&oracle.jdbc.thinForceDNSLoadBalancing=true&tcp.nodelay=yes',
+                    'connection.init_sql' : ''
+            ],
+            oracle_cloud_db19c : [
+                    'db.dialect' : 'org.hibernate.dialect.OracleDialect',
+                    'jdbc.driver': 'oracle.jdbc.OracleDriver',
+                    'jdbc.user'  : 'hibernate_orm_test_' + runID,
+                    'jdbc.pass'  : 'Oracle_19_Password',
+                    // Requires dbHost (pointing to the right cloud region) AND dbService (unique database name).
+                    //
+                    // To avoid hibernate-spatial tests failure, JVM must be enabled as stated in documentation:
+                    // https://docs.oracle.com/en/cloud/paas/autonomous-database/adbsa/autonomous-oracle-java.html
+                    'jdbc.url'   : 'jdbc:oracle:thin:@' + dbHost + ':1521/' + dbService,
+                    'connection.init_sql' : ''
+            ],
+            oracle_cloud_db21c : [
+                    'db.dialect' : 'org.hibernate.dialect.OracleDialect',
+                    'jdbc.driver': 'oracle.jdbc.OracleDriver',
+                    'jdbc.user'  : 'hibernate_orm_test_' + runID,
+                    'jdbc.pass'  : 'Oracle_21_Password',
+                    // Requires dbHost (pointing to the right cloud region) AND dbService (unique database name).
+                    //
+                    // To avoid hibernate-spatial tests failure, JVM must be enabled as stated in documentation:
+                    // https://docs.oracle.com/en/cloud/paas/autonomous-database/adbsa/autonomous-oracle-java.html
+                    'jdbc.url'   : 'jdbc:oracle:thin:@' + dbHost + ':1521/' + dbService,
+                    'connection.init_sql' : ''
+            ],
+            oracle_cloud_db23c : [
+                    'db.dialect' : 'org.hibernate.dialect.OracleDialect',
+                    'jdbc.driver': 'oracle.jdbc.OracleDriver',
+                    'jdbc.user'  : 'hibernate_orm_test_' + runID,
+                    'jdbc.pass'  : 'Oracle_23_Password',
+                    // Requires dbHost (pointing to the right cloud region) AND dbService (unique database name).
+                    //
+                    // To avoid hibernate-spatial tests failure, JVM must be enabled as stated in documentation:
+                    // https://docs.oracle.com/en/cloud/paas/autonomous-database/adbsa/autonomous-oracle-java.html
+                    'jdbc.url'   : 'jdbc:oracle:thin:@' + dbHost + ':1521/' + dbService,
                     'connection.init_sql' : ''
             ],
             mssql : [
@@ -266,7 +321,7 @@ if ( processTestResourcesTask != null ) {
     processTestResourcesTask.inputs.property( 'dbHost', dbHost )
 //        processTestResourcesTask.inputs.property( "gradle.libs.versions.h2", project.getProperty( "gradle.libs.versions.h2", "2.1.214" ) )
 //        processTestResourcesTask.inputs.property( "gradle.libs.versions.h2gis", project.getProperty( "gradle.libs.versions.h2gis", "2.1.0" ) )
-//        processTestResourcesTask.inputs.property( "gradle.libs.versions.hsqldb", project.getProperty( "gradle.libs.versions.hsqldb", "2.7.1" ) )
+//        processTestResourcesTask.inputs.property( "gradle.libs.versions.hsqldb", project.getProperty( "gradle.libs.versions.hsqldb", "2.7.2" ) )
 //        processTestResourcesTask.inputs.property( "gradle.libs.versions.derby", project.getProperty( "gradle.libs.versions.derby", "10.15.2.0" ) )
     processTestResourcesTask.filter( ReplaceTokens, tokens: dbBundle[db] )
 }
diff --git a/wrapper/src/test/resources/hibernate_files/hibernate-core.gradle b/wrapper/src/test/resources/hibernate_files/hibernate-core.gradle
diff --git a/wrapper/src/test/resources/hibernate_files/java-module.gradle b/wrapper/src/test/resources/hibernate_files/java-module.gradle
