Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-17888 - Remove support for MariaDB versions older than 10.5 

Signed-off-by: Jan Schatteman <jschatte@redhat.com>
This commit is contained in:
Jan Schatteman 2024-07-31 19:38:21 +02:00 committed by Steve Ebersole
parent 2273365e06
commit cbe89511d2
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docker_db.sh
View File

@ -114,9 +114,9 @@ mariadb_wait_until_start()
fi fi
} }
mariadb_10_4() { mariadb_10_5() {
$CONTAINER_CLI rm -f mariadb || true $CONTAINER_CLI rm -f mariadb || true
$CONTAINER_CLI run --name mariadb -e MARIADB_USER=hibernate_orm_test -e MARIADB_PASSWORD=hibernate_orm_test -e MARIADB_DATABASE=hibernate_orm_test -e MARIADB_ROOT_PASSWORD=hibernate_orm_test -p3306:3306 -d docker.io/mariadb:10.4.33 --character-set-server=utf8mb4 --collation-server=utf8mb4_bin --skip-character-set-client-handshake --lower_case_table_names=2 $CONTAINER_CLI run --name mariadb -e MARIADB_USER=hibernate_orm_test -e MARIADB_PASSWORD=hibernate_orm_test -e MARIADB_DATABASE=hibernate_orm_test -e MARIADB_ROOT_PASSWORD=hibernate_orm_test -p3306:3306 -d docker.io/mariadb:10.5.25 --character-set-server=utf8mb4 --collation-server=utf8mb4_bin --skip-character-set-client-handshake --lower_case_table_names=2
mariadb_wait_until_start mariadb_wait_until_start
} }
@ -980,7 +980,7 @@ if [ -z ${1} ]; then
echo -e "\tmariadb_11_4" echo -e "\tmariadb_11_4"
echo -e "\tmariadb_11_1" echo -e "\tmariadb_11_1"
echo -e "\tmariadb_10_11" echo -e "\tmariadb_10_11"
echo -e "\tmariadb_10_4" echo -e "\tmariadb_10_5"
echo -e "\tmssql" echo -e "\tmssql"
echo -e "\tmssql_2022" echo -e "\tmssql_2022"
echo -e "\tmssql_2017" echo -e "\tmssql_2017"

8
hibernate-core/src/main/java/org/hibernate/dialect/MariaDBDialect.java
View File

@ -44,13 +44,13 @@ import static org.hibernate.type.SqlTypes.UUID;
import static org.hibernate.type.SqlTypes.VARBINARY; import static org.hibernate.type.SqlTypes.VARBINARY;
/** /**
* A {@linkplain Dialect SQL dialect} for MariaDB 10.3 and above. * A {@linkplain Dialect SQL dialect} for MariaDB 10.5 and above.
* *
* @author Vlad Mihalcea * @author Vlad Mihalcea
* @author Gavin King * @author Gavin King
*/ */
public class MariaDBDialect extends MySQLDialect { public class MariaDBDialect extends MySQLDialect {
private static final DatabaseVersion MINIMUM_VERSION = DatabaseVersion.make( 10, 4 ); private static final DatabaseVersion MINIMUM_VERSION = DatabaseVersion.make( 10, 5 );
private static final DatabaseVersion MYSQL57 = DatabaseVersion.make( 5, 7 ); private static final DatabaseVersion MYSQL57 = DatabaseVersion.make( 5, 7 );
public MariaDBDialect() { public MariaDBDialect() {
@ -192,7 +192,7 @@ public class MariaDBDialect extends MySQLDialect {
@Override @Override
public boolean supportsIfExistsAfterAlterTable() { public boolean supportsIfExistsAfterAlterTable() {
return getVersion().isSameOrAfter( 10, 5 ); return true;
} }
@Override @Override
@ -248,7 +248,7 @@ public class MariaDBDialect extends MySQLDialect {
*/ */
@Override @Override
public boolean supportsInsertReturning() { public boolean supportsInsertReturning() {
return getVersion().isSameOrAfter( 10, 5 ); return true;
} }
@Override @Override

6
nightly.Jenkinsfile
View File

@ -29,7 +29,7 @@ stage('Configure') {
// Minimum supported versions // Minimum supported versions
new BuildEnvironment( dbName: 'hsqldb_2_6' ), new BuildEnvironment( dbName: 'hsqldb_2_6' ),
new BuildEnvironment( dbName: 'mysql_8_0' ), new BuildEnvironment( dbName: 'mysql_8_0' ),
new BuildEnvironment( dbName: 'mariadb_10_4' ), new BuildEnvironment( dbName: 'mariadb_10_5' ),
new BuildEnvironment( dbName: 'postgresql_12' ), new BuildEnvironment( dbName: 'postgresql_12' ),
new BuildEnvironment( dbName: 'edb_12' ), new BuildEnvironment( dbName: 'edb_12' ),
new BuildEnvironment( dbName: 'db2_10_5', longRunning: true ), new BuildEnvironment( dbName: 'db2_10_5', longRunning: true ),
@ -116,11 +116,11 @@ stage('Build') {
sh "./docker_db.sh mysql_8_0" sh "./docker_db.sh mysql_8_0"
state[buildEnv.tag]['containerName'] = "mysql" state[buildEnv.tag]['containerName'] = "mysql"
break; break;
case "mariadb_10_4": case "mariadb_10_5":
docker.withRegistry('https://index.docker.io/v1/', 'hibernateci.hub.docker.com') { docker.withRegistry('https://index.docker.io/v1/', 'hibernateci.hub.docker.com') {
docker.image('mariadb:10.4.31').pull() docker.image('mariadb:10.4.31').pull()
} }
sh "./docker_db.sh mariadb_10_4" sh "./docker_db.sh mariadb_10_5"
state[buildEnv.tag]['containerName'] = "mariadb" state[buildEnv.tag]['containerName'] = "mariadb"
break; break;
case "postgresql_12": case "postgresql_12":