HHH-18037 - Move DerbyDialect to hibernate-community-dialects

Signed-off-by: Jan Schatteman <[email protected]>

Author: jrenaat

.github/hibernate-github-bot.yml

@@ -53,7 +53,7 @@ develocity:
         pattern: "s390x"
         replacement: "$0"
       - column: "DB"
-        pattern: "((?:h2|postgres(?:ql)?|pgsql|mysql|mariadb|mssql|derby|tidb|cockroach(?:db)?|oracle|db2|hsqldb|edb|sybase)(?:.*(?=_ci)|.*))(?:_ci)?"
+        pattern: "((?:h2|postgres(?:ql)?|pgsql|mysql|mariadb|mssql|tidb|cockroach(?:db)?|oracle|db2|hsqldb|edb|sybase)(?:.*(?=_ci)|.*))(?:_ci)?"
         replacement: "$1"
       - pattern: "main|HEAD|\\d+.\\d+|PR-\\d+"
         replacement: "" # Just remove these tags

.github/workflows/contributor-build.yml

@@ -42,7 +42,6 @@ jobs:
         include:
           - rdbms: h2
           - rdbms: hsqldb
-          - rdbms: derby
           - rdbms: mysql
           - rdbms: mariadb
           - rdbms: postgresql

ci/build.sh

@@ -6,8 +6,6 @@ if [ "$RDBMS" == "h2" ]; then
   goal=""
 elif [ "$RDBMS" == "hsqldb" ] || [ "$RDBMS" == "hsqldb_2_6" ]; then
   goal="-Pdb=hsqldb"
-elif [ "$RDBMS" == "derby" ]; then
-  goal="-Pdb=derby"
 elif [ "$RDBMS" == "mysql" ] || [ "$RDBMS" == "mysql_8_0" ]; then
   goal="-Pdb=mysql_ci"
 elif [ "$RDBMS" == "mariadb" ] || [ "$RDBMS" == "mariadb_10_4" ]; then

ci/jpa-3.2-tck.Jenkinsfile

@@ -36,7 +36,7 @@ pipeline {
         string(name: 'TCK_VERSION', defaultValue: '3.2.0', description: 'The version of the Jakarta JPA TCK i.e. `2.2.0` or `3.0.1`')
         string(name: 'TCK_SHA', defaultValue: '', description: 'The SHA256 of the Jakarta JPA TCK that is distributed under https://download.eclipse.org/jakartaee/persistence/3.1/jakarta-persistence-tck-${TCK_VERSION}.zip.sha256')
 		string(name: 'TCK_URL', defaultValue: 'https://www.eclipse.org/downloads/download.php?file=/ee4j/jakartaee-tck/jakartaee11/staged/eftl/jakarta-persistence-tck-3.2.0.zip&mirror_id=1', description: 'The URL from which to download the TCK ZIP file. Only needed for testing staged builds. Ensure the TCK_VERSION variable matches the ZIP file name suffix.')
-        choice(name: 'RDBMS', choices: ['derby','mysql','mssql','oracle','postgresql','db2','sybase'], description: 'The JDK base image version to use for the TCK image.')
+        choice(name: 'RDBMS', choices: ['mysql','mssql','oracle','postgresql','db2','sybase'], description: 'The JDK base image version to use for the TCK image.')
 	}
     stages {
         stage('Build') {
@@ -116,9 +116,7 @@ pipeline {
 					else {
 						containerName = params.RDBMS
 					}
-					def dockerRunOptions
-					if ( params.RDBMS != 'derby' ) {
-						dockerRunOptions = "--network=tck-net -e DB_HOST=${containerName}"
+					def dockerRunOptions = "--network=tck-net -e DB_HOST=${containerName}"
 						sh """ \
 							while IFS= read -r container; do
 								docker network disconnect tck-net \$container || true
@@ -127,10 +125,6 @@ pipeline {
 							docker network create tck-net
 							docker network connect tck-net ${containerName}
 						"""
-					}
-					else {
-						dockerRunOptions = ""
-					}
 					sh """ \
 						rm -Rf ./results
 						docker rm -f tck || true

databases/derby/matrix.gradle

@@ -103,7 +103,7 @@ hibernate.connection.url jdbc:hsqldb:./build/db/hsqldb/hibernate
 
 ## Derby (not supported!)
 
-#hibernate.dialect org.hibernate.dialect.DerbyDialect
+#hibernate.dialect org.hibernate.community.dialect.DerbyDialect
 #hibernate.connection.driver_class org.apache.derby.jdbc.EmbeddedDriver
 #hibernate.connection.username
 #hibernate.connection.password

databases/derby/resources/hibernate.properties

@@ -89,7 +89,7 @@ hibernate.connection.url @DB_URL@
 
 ## Derby (Not supported!)
 
-#hibernate.dialect org.hibernate.dialect.DerbyDialect
+#hibernate.dialect org.hibernate.community.dialect.DerbyDialect
 #hibernate.connection.driver_class org.apache.derby.jdbc.EmbeddedDriver
 #hibernate.connection.username
 #hibernate.connection.password

etc/hibernate.properties

@@ -211,6 +211,23 @@ public Dialect createDialect(DialectResolutionInfo info) {
 		public boolean productNameMatches(String databaseName) {
 			return databaseName.toLowerCase().startsWith( "timesten" );
 		}
+	},
+
+	DERBY {
+		@Override
+		public Dialect createDialect(DialectResolutionInfo info) {
+			return new DerbyDialect( info );
+		}
+		@Override
+		public boolean productNameMatches(String databaseName) {
+			return "Apache Derby".equals( databaseName );
+		}
+		@Override
+		public String getDriverClassName(String jdbcUrl) {
+			return jdbcUrl.startsWith( "jdbc:derby://" )
+					? "org.apache.derby.jdbc.ClientDriver"
+					: "org.apache.derby.jdbc.EmbeddedDriver";
+		}
 	};
 
 	/**

etc/hibernate.properties.template

@@ -50,6 +50,11 @@ public Class<? extends Dialect> resolve(String name) {
 				return TeradataDialect.class;
 			case "TimesTen":
 				return TimesTenDialect.class;
+			case "DerbyTenFive":
+			case "DerbyTenSix":
+			case "DerbyTenSeven":
+			case "Derby":
+				return DerbyDialect.class;
 		}
 		return null;
 	}