Fix most tests to work on all DBs and fix a bunch of connection leaks

Author: beikov

.github/workflows/contributor-build.yml

@@ -72,7 +72,9 @@ jobs:
         if: failure()
         with:
           name: test-reports-java8-${{ matrix.rdbms }}
-          path: './**/target/reports/tests/test/'
+          path: |
+            ./**/target/reports/tests/
+            ./**/target/reports/checkstyle/
       - name: Omit produced artifacts from build cache
         run: ./ci/before-cache.sh
   build11:
@@ -109,6 +111,8 @@ jobs:
         if: failure()
         with:
           name: test-reports-java11
-          path: './**/target/reports/tests/test/'
+          path: |
+            ./**/target/reports/tests/
+            ./**/target/reports/checkstyle/
       - name: Omit produced artifacts from build cache
         run: ./ci/before-cache.sh

ci/build-github.sh

@@ -3,7 +3,7 @@
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 
 java -version
-./gradlew assemble
+
 if [ "$RDBMS" == 'mysql' ]; then
   bash $DIR/../docker_db.sh mysql_5_7
 elif [ "$RDBMS" == 'mysql8' ]; then

ci/build-travis.sh

@@ -3,7 +3,7 @@
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 
 java -version
-./gradlew assemble
+
 if [ "$RDBMS" == 'mysql' ]; then
   sudo service mysql stop
   bash $DIR/../docker_db.sh mysql_5_7

ci/build.sh

@@ -4,15 +4,15 @@ goal=
 if [ "$RDBMS" == "derby" ]; then
   goal="-Pdb=derby"
 elif [ "$RDBMS" == "mariadb" ]; then
-  goal="-Pdb=mariadb"
+  goal="-Pdb=mariadb_ci"
 elif [ "$RDBMS" == "postgresql" ]; then
-  goal="-Pdb=pgsql"
+  goal="-Pdb=pgsql_ci"
 elif [ "$RDBMS" == "oracle" ]; then
-  goal="-Pdb=oracle -Dhibernate.connection.url=jdbc:oracle:thin:@localhost:1521:XE -Dhibernate.connection.username=SYSTEM -Dhibernate.connection.password=Oracle18"
+  goal="-Pdb=oracle_ci"
 elif [ "$RDBMS" == "db2" ]; then
-  goal="-Pdb=db2 -Dhibernate.connection.url=jdbc:db2://localhost:50000/orm_test -Dhibernate.connection.username=orm_test -Dhibernate.connection.password=orm_test"
+  goal="-Pdb=db2_ci"
 elif [ "$RDBMS" == "mssql" ]; then
-  goal="-Pdb=mssql -Dhibernate.connection.url=jdbc:sqlserver://localhost:1433;databaseName= -Dhibernate.connection.username=sa -Dhibernate.connection.password=hibernate_orm_test"
+  goal="-Pdb=mssql_ci"
 fi
 
 exec ./gradlew check ${goal} -Plog-test-progress=true --stacktrace

docker_db.sh

@@ -12,7 +12,7 @@ mysql_8_0() {
 
 mariadb() {
     docker rm -f mariadb || true
-    docker run --name mariadb -e MYSQL_USER=hibernate_orm_test -e MYSQL_PASSWORD=hibernate_orm_test -e MYSQL_DATABASE=hibernate_orm_test -p3306:3306 -d mariadb:10.5.8 --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
+    docker run --name mariadb -e MYSQL_USER=hibernate_orm_test -e MYSQL_PASSWORD=hibernate_orm_test -e MYSQL_DATABASE=hibernate_orm_test -e MYSQL_ROOT_PASSWORD=hibernate_orm_test -p3306:3306 -d mariadb:10.5.8 --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
 }
 
 postgresql_9_5() {
@@ -22,10 +22,10 @@ postgresql_9_5() {
 
 db2() {
     docker rm -f db2 || true
-    docker run --name db2 --privileged -e DB2INSTANCE=orm_test -e DB2INST1_PASSWORD=orm_test -e DBNAME=orm_test -e LICENSE=accept -p 50000:50000 -d ibmcom/db2:11.5.0.0a
+    docker run --name db2 --privileged -e DB2INSTANCE=orm_test -e DB2INST1_PASSWORD=orm_test -e DBNAME=orm_test -e LICENSE=accept -e AUTOCONFIG=false -e ARCHIVE_LOGS=false -e TO_CREATE_SAMPLEDB=false -e REPODB=false -p 50000:50000 -d ibmcom/db2:11.5.5.0
     # Give the container some time to start
     OUTPUT=
-    while [[ $OUTPUT != *"Setup has completed"* ]]; do
+    while [[ $OUTPUT != *"INSTANCE"* ]]; do
         echo "Waiting for DB2 to start..."
         sleep 10
         OUTPUT=$(docker logs db2)
@@ -35,14 +35,56 @@ db2() {
 
 mssql() {
     docker rm -f mssql || true
-    docker run --name mssql -d -p 1433:1433 -e "SA_PASSWORD=hibernate_orm_test" -e ACCEPT_EULA=Y microsoft/mssql-server-linux:2017-CU13
+    docker run --name mssql -d -p 1433:1433 -e "SA_PASSWORD=Hibernate_orm_test" -e ACCEPT_EULA=Y microsoft/mssql-server-linux:2017-CU13
+    sleep 5
+    n=0
+    until [ "$n" -ge 5 ]
+    do
+        # We need a database that uses a non-lock based MVCC approach
+        # https://github.com/microsoft/homebrew-mssql-release/issues/2#issuecomment-682285561
+        docker exec mssql bash -c 'echo "create database hibernate_orm_test collate SQL_Latin1_General_CP1_CI_AS; alter database hibernate_orm_test set READ_COMMITTED_SNAPSHOT ON" | /opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P Hibernate_orm_test -i /dev/stdin' && break
+        echo "Waiting for SQL Server to start..."
+        n=$((n+1))
+        sleep 5
+    done
+    if [ "$n" -ge 5 ]; then
+      echo "SQL Server failed to start and configure after 25 seconds"
+    else
+      echo "SQL Server successfully started"
+    fi
 }
 
 oracle() {
     docker rm -f oracle || true
     # We need to use the defaults
     # SYSTEM/Oracle18
     docker run --shm-size=1536m --name oracle -d -p 1521:1521 quillbuilduser/oracle-18-xe
+    until [ "`docker inspect -f {{.State.Health.Status}} oracle`" == "healthy" ];
+    do
+        echo "Waiting for Oracle to start..."
+      sleep 10;
+    done
+    echo "Oracle successfully started"
+    # We increase file sizes to avoid online resizes as that requires lots of CPU which is restricted in XE
+    docker exec oracle bash -c "source /home/oracle/.bashrc; bash -c \"
+cat <<EOF | \$ORACLE_HOME/bin/sqlplus sys/Oracle18@localhost/XE as sysdba
+alter database tempfile '/opt/oracle/oradata/XE/temp01.dbf' resize 400M;
+alter database datafile '/opt/oracle/oradata/XE/system01.dbf' resize 1000M;
+alter database datafile '/opt/oracle/oradata/XE/sysaux01.dbf' resize 600M;
+alter database datafile '/opt/oracle/oradata/XE/undotbs01.dbf' resize 300M;
+alter database add logfile group 4 '/opt/oracle/oradata/XE/redo04.log' size 500M reuse;
+alter database add logfile group 5 '/opt/oracle/oradata/XE/redo05.log' size 500M reuse;
+alter database add logfile group 6 '/opt/oracle/oradata/XE/redo06.log' size 500M reuse;
+
+alter system switch logfile;
+alter system switch logfile;
+alter system switch logfile;
+alter system checkpoint;
+
+alter database drop logfile group 1;
+alter database drop logfile group 2;
+alter database drop logfile group 3;
+EOF\""
 }
 
 if [ -z ${1} ]; then

documentation/src/test/java/org/hibernate/userguide/events/ListenerTest.java

@@ -136,7 +136,7 @@ public void setName(String name) {
 	}
 
 	//tag::events-jpa-callbacks-example[]
-	@Entity
+	@Entity(name = "Person")
 	@EntityListeners( LastUpdateListener.class )
 	public static class Person {
 

documentation/src/test/java/org/hibernate/userguide/hql/HQLTest.java

@@ -25,6 +25,7 @@
 import org.hibernate.ScrollableResults;
 import org.hibernate.Session;
 import org.hibernate.dialect.CockroachDB192Dialect;
+import org.hibernate.dialect.DerbyDialect;
 import org.hibernate.dialect.H2Dialect;
 import org.hibernate.dialect.MySQL5Dialect;
 import org.hibernate.dialect.Oracle8iDialect;
@@ -1178,6 +1179,7 @@ public void test_hql_aggregate_functions_example_3() {
 	}
 
 	@Test
+	@SkipForDialect(value = DerbyDialect.class, comment = "See https://issues.apache.org/jira/browse/DERBY-2072")
 	public void test_hql_concat_function_example() {
 		doInJPA( this::entityManagerFactory, entityManager -> {
 			//tag::hql-concat-function-example[]
@@ -1312,6 +1314,7 @@ public void test_hql_sqrt_function_example() {
 
 	@Test
 	@SkipForDialect(SQLServerDialect.class)
+	@SkipForDialect(value = DerbyDialect.class, comment = "Comparisons between 'DATE' and 'TIMESTAMP' are not supported")
 	public void test_hql_current_date_function_example() {
 		doInJPA( this::entityManagerFactory, entityManager -> {
 			//tag::hql-current-date-function-example[]
@@ -1383,6 +1386,7 @@ public void test_hql_bit_length_function_example() {
 	}
 
 	@Test
+	@SkipForDialect(value = DerbyDialect.class, comment = "See https://issues.apache.org/jira/browse/DERBY-2072")
 	public void test_hql_cast_function_example() {
 		doInJPA( this::entityManagerFactory, entityManager -> {
 			//tag::hql-cast-function-example[]
@@ -1396,6 +1400,7 @@ public void test_hql_cast_function_example() {
 	}
 
 	@Test
+	@SkipForDialect(value = DerbyDialect.class, comment = "Derby doesn't support extract function")
 	public void test_hql_extract_function_example() {
 		doInJPA( this::entityManagerFactory, entityManager -> {
 			//tag::hql-extract-function-example[]
@@ -1550,6 +1555,7 @@ public void test_hql_collection_expressions_example_6() {
 	}
 
 	@Test
+	@SkipForDialect(value = DerbyDialect.class, comment = "Comparisons between 'DATE' and 'TIMESTAMP' are not supported")
 	public void test_hql_collection_expressions_example_7() {
 		doInJPA( this::entityManagerFactory, entityManager -> {
 			//tag::hql-collection-expressions-example[]
@@ -1565,6 +1571,7 @@ public void test_hql_collection_expressions_example_7() {
 	}
 
 	@Test
+	@SkipForDialect(value = DerbyDialect.class, comment = "Comparisons between 'DATE' and 'TIMESTAMP' are not supported")
 	public void test_hql_collection_expressions_example_8() {
 		doInJPA( this::entityManagerFactory, entityManager -> {
 			//tag::hql-collection-expressions-example[]

documentation/src/test/java/org/hibernate/userguide/mapping/basic/NClobCharArrayTest.java

@@ -11,6 +11,7 @@
 import javax.persistence.Lob;
 
 import org.hibernate.annotations.Nationalized;
+import org.hibernate.dialect.DB2Dialect;
 import org.hibernate.dialect.MySQL5Dialect;
 import org.hibernate.dialect.PostgreSQL81Dialect;
 import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase;
@@ -27,9 +28,10 @@
 @SkipForDialect(
         value = {
                 PostgreSQL81Dialect.class,
-                MySQL5Dialect.class
+                MySQL5Dialect.class,
+                DB2Dialect.class
         },
-        comment = "@see https://hibernate.atlassian.net/browse/HHH-10693 and https://hibernate.atlassian.net/browse/HHH-10695"
+        comment = "@see https://hibernate.atlassian.net/browse/HHH-10693 and https://hibernate.atlassian.net/browse/HHH-10695 and https://hibernate.atlassian.net/browse/HHH-10473"
 )
 public class NClobCharArrayTest extends BaseEntityManagerFunctionalTestCase {
 

documentation/src/test/java/org/hibernate/userguide/mapping/basic/NClobStringTest.java

@@ -11,6 +11,7 @@
 import javax.persistence.Lob;
 
 import org.hibernate.annotations.Nationalized;
+import org.hibernate.dialect.DB2Dialect;
 import org.hibernate.dialect.MySQL5Dialect;
 import org.hibernate.dialect.PostgreSQL81Dialect;
 import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase;
@@ -27,9 +28,10 @@
 @SkipForDialect(
         value = {
                 PostgreSQL81Dialect.class,
-                MySQL5Dialect.class
+                MySQL5Dialect.class,
+                DB2Dialect.class
         },
-        comment = "@see https://hibernate.atlassian.net/browse/HHH-10693 and https://hibernate.atlassian.net/browse/HHH-10695"
+        comment = "@see https://hibernate.atlassian.net/browse/HHH-10693 and https://hibernate.atlassian.net/browse/HHH-10695 and https://hibernate.atlassian.net/browse/HHH-10473"
 )
 public class NClobStringTest extends BaseEntityManagerFunctionalTestCase {
 

documentation/src/test/java/org/hibernate/userguide/mapping/basic/NClobTest.java

@@ -19,6 +19,7 @@
 import org.hibernate.annotations.Nationalized;
 import org.hibernate.dialect.AbstractHANADialect;
 import org.hibernate.dialect.CockroachDB192Dialect;
+import org.hibernate.dialect.DB2Dialect;
 import org.hibernate.dialect.MySQL5Dialect;
 import org.hibernate.dialect.PostgreSQL81Dialect;
 import org.hibernate.engine.jdbc.NClobProxy;
@@ -39,9 +40,10 @@
                 PostgreSQL81Dialect.class,
                 MySQL5Dialect.class,
                 AbstractHANADialect.class,
-                CockroachDB192Dialect.class
+                CockroachDB192Dialect.class,
+                DB2Dialect.class
         },
-        comment = "@see https://hibernate.atlassian.net/browse/HHH-10693 and https://hibernate.atlassian.net/browse/HHH-10695"
+        comment = "@see https://hibernate.atlassian.net/browse/HHH-10693 and https://hibernate.atlassian.net/browse/HHH-10695 and https://hibernate.atlassian.net/browse/HHH-10473"
 )
 public class NClobTest extends BaseEntityManagerFunctionalTestCase {