Skip to content

Commit cbe8951

Browse files
jrenaatsebersole
authored andcommitted
HHH-17888 - Remove support for MariaDB versions older than 10.5
Signed-off-by: Jan Schatteman <[email protected]>
1 parent 2273365 commit cbe8951

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

docker_db.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,9 @@ mariadb_wait_until_start()
114114
fi
115115
}
116116

117-
mariadb_10_4() {
117+
mariadb_10_5() {
118118
$CONTAINER_CLI rm -f mariadb || true
119-
$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
119+
$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
120120
mariadb_wait_until_start
121121
}
122122

@@ -980,7 +980,7 @@ if [ -z ${1} ]; then
980980
echo -e "\tmariadb_11_4"
981981
echo -e "\tmariadb_11_1"
982982
echo -e "\tmariadb_10_11"
983-
echo -e "\tmariadb_10_4"
983+
echo -e "\tmariadb_10_5"
984984
echo -e "\tmssql"
985985
echo -e "\tmssql_2022"
986986
echo -e "\tmssql_2017"

hibernate-core/src/main/java/org/hibernate/dialect/MariaDBDialect.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,13 @@
4444
import static org.hibernate.type.SqlTypes.VARBINARY;
4545

4646
/**
47-
* A {@linkplain Dialect SQL dialect} for MariaDB 10.3 and above.
47+
* A {@linkplain Dialect SQL dialect} for MariaDB 10.5 and above.
4848
*
4949
* @author Vlad Mihalcea
5050
* @author Gavin King
5151
*/
5252
public class MariaDBDialect extends MySQLDialect {
53-
private static final DatabaseVersion MINIMUM_VERSION = DatabaseVersion.make( 10, 4 );
53+
private static final DatabaseVersion MINIMUM_VERSION = DatabaseVersion.make( 10, 5 );
5454
private static final DatabaseVersion MYSQL57 = DatabaseVersion.make( 5, 7 );
5555

5656
public MariaDBDialect() {
@@ -192,7 +192,7 @@ public boolean supportsIfExistsBeforeConstraintName() {
192192

193193
@Override
194194
public boolean supportsIfExistsAfterAlterTable() {
195-
return getVersion().isSameOrAfter( 10, 5 );
195+
return true;
196196
}
197197

198198
@Override
@@ -248,7 +248,7 @@ boolean supportsAliasLocks() {
248248
*/
249249
@Override
250250
public boolean supportsInsertReturning() {
251-
return getVersion().isSameOrAfter( 10, 5 );
251+
return true;
252252
}
253253

254254
@Override

nightly.Jenkinsfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ stage('Configure') {
2929
// Minimum supported versions
3030
new BuildEnvironment( dbName: 'hsqldb_2_6' ),
3131
new BuildEnvironment( dbName: 'mysql_8_0' ),
32-
new BuildEnvironment( dbName: 'mariadb_10_4' ),
32+
new BuildEnvironment( dbName: 'mariadb_10_5' ),
3333
new BuildEnvironment( dbName: 'postgresql_12' ),
3434
new BuildEnvironment( dbName: 'edb_12' ),
3535
new BuildEnvironment( dbName: 'db2_10_5', longRunning: true ),
@@ -116,11 +116,11 @@ stage('Build') {
116116
sh "./docker_db.sh mysql_8_0"
117117
state[buildEnv.tag]['containerName'] = "mysql"
118118
break;
119-
case "mariadb_10_4":
119+
case "mariadb_10_5":
120120
docker.withRegistry('https://index.docker.io/v1/', 'hibernateci.hub.docker.com') {
121121
docker.image('mariadb:10.4.31').pull()
122122
}
123-
sh "./docker_db.sh mariadb_10_4"
123+
sh "./docker_db.sh mariadb_10_5"
124124
state[buildEnv.tag]['containerName'] = "mariadb"
125125
break;
126126
case "postgresql_12":

0 commit comments

Comments
 (0)