File tree Expand file tree Collapse file tree 3 files changed +10
-10
lines changed
hibernate-core/src/main/java/org/hibernate/dialect Expand file tree Collapse file tree 3 files changed +10
-10
lines changed Original file line number Diff line number Diff line change @@ -114,9 +114,9 @@ mariadb_wait_until_start()
114
114
fi
115
115
}
116
116
117
- mariadb_10_4 () {
117
+ mariadb_10_5 () {
118
118
$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
120
120
mariadb_wait_until_start
121
121
}
122
122
@@ -980,7 +980,7 @@ if [ -z ${1} ]; then
980
980
echo -e " \tmariadb_11_4"
981
981
echo -e " \tmariadb_11_1"
982
982
echo -e " \tmariadb_10_11"
983
- echo -e " \tmariadb_10_4 "
983
+ echo -e " \tmariadb_10_5 "
984
984
echo -e " \tmssql"
985
985
echo -e " \tmssql_2022"
986
986
echo -e " \tmssql_2017"
Original file line number Diff line number Diff line change 44
44
import static org .hibernate .type .SqlTypes .VARBINARY ;
45
45
46
46
/**
47
- * A {@linkplain Dialect SQL dialect} for MariaDB 10.3 and above.
47
+ * A {@linkplain Dialect SQL dialect} for MariaDB 10.5 and above.
48
48
*
49
49
* @author Vlad Mihalcea
50
50
* @author Gavin King
51
51
*/
52
52
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 );
54
54
private static final DatabaseVersion MYSQL57 = DatabaseVersion .make ( 5 , 7 );
55
55
56
56
public MariaDBDialect () {
@@ -192,7 +192,7 @@ public boolean supportsIfExistsBeforeConstraintName() {
192
192
193
193
@ Override
194
194
public boolean supportsIfExistsAfterAlterTable () {
195
- return getVersion (). isSameOrAfter ( 10 , 5 ) ;
195
+ return true ;
196
196
}
197
197
198
198
@ Override
@@ -248,7 +248,7 @@ boolean supportsAliasLocks() {
248
248
*/
249
249
@ Override
250
250
public boolean supportsInsertReturning () {
251
- return getVersion (). isSameOrAfter ( 10 , 5 ) ;
251
+ return true ;
252
252
}
253
253
254
254
@ Override
Original file line number Diff line number Diff line change @@ -29,7 +29,7 @@ stage('Configure') {
29
29
// Minimum supported versions
30
30
new BuildEnvironment( dbName: 'hsqldb_2_6' ),
31
31
new BuildEnvironment( dbName: 'mysql_8_0' ),
32
- new BuildEnvironment( dbName: 'mariadb_10_4 ' ),
32
+ new BuildEnvironment( dbName: 'mariadb_10_5 ' ),
33
33
new BuildEnvironment( dbName: 'postgresql_12' ),
34
34
new BuildEnvironment( dbName: 'edb_12' ),
35
35
new BuildEnvironment( dbName: 'db2_10_5', longRunning: true ),
@@ -116,11 +116,11 @@ stage('Build') {
116
116
sh "./docker_db.sh mysql_8_0"
117
117
state[buildEnv.tag]['containerName'] = "mysql"
118
118
break;
119
- case "mariadb_10_4 ":
119
+ case "mariadb_10_5 ":
120
120
docker.withRegistry('https://index.docker.io/v1/', 'hibernateci.hub.docker.com') {
121
121
docker.image('mariadb:10.4.31').pull()
122
122
}
123
- sh "./docker_db.sh mariadb_10_4 "
123
+ sh "./docker_db.sh mariadb_10_5 "
124
124
state[buildEnv.tag]['containerName'] = "mariadb"
125
125
break;
126
126
case "postgresql_12":
You can’t perform that action at this time.
0 commit comments