Skip to content

Commit 6eb3bf9

Browse files
committed
HHH-19728 Update SQL Server CI testing to 2025 and the MSSQL JDBC driver
1 parent 42c6185 commit 6eb3bf9

File tree

2 files changed

+24
-2
lines changed

2 files changed

+24
-2
lines changed

docker_db.sh

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@ EOF
371371
}
372372

373373
mssql() {
374-
mssql_2022
374+
mssql_2025
375375
}
376376

377377
mssql_2017() {
@@ -418,6 +418,28 @@ mssql_2022() {
418418
fi
419419
}
420420

421+
mssql_2025() {
422+
$CONTAINER_CLI rm -f mssql || true
423+
#This sha256 matches a specific tag of 2025-latest (https://mcr.microsoft.com/en-us/product/mssql/server/tags):
424+
$CONTAINER_CLI run --name mssql -d -p 1433:1433 -e "SA_PASSWORD=Hibernate_orm_test" -e ACCEPT_EULA=Y ${DB_IMAGE_MSSQL_2025:-mcr.microsoft.com/mssql/server@sha256:2fa59c23272a23dfd9600abf4ee52c0de6ae7ac640f14c617bc717ec139a5295}
425+
sleep 5
426+
n=0
427+
until [ "$n" -ge 5 ]
428+
do
429+
# We need a database that uses a non-lock based MVCC approach
430+
# https://github.com/microsoft/homebrew-mssql-release/issues/2#issuecomment-682285561
431+
$CONTAINER_CLI exec mssql bash -c 'echo "create database hibernate_orm_test collate SQL_Latin1_General_CP1_CS_AS; alter database hibernate_orm_test set READ_COMMITTED_SNAPSHOT ON" | /opt/mssql-tools18/bin/sqlcmd -C -S localhost -U sa -P Hibernate_orm_test -i /dev/stdin' && break
432+
echo "Waiting for SQL Server to start..."
433+
n=$((n+1))
434+
sleep 5
435+
done
436+
if [ "$n" -ge 5 ]; then
437+
echo "SQL Server failed to start and configure after 25 seconds"
438+
else
439+
echo "SQL Server successfully started"
440+
fi
441+
}
442+
421443
sybase() {
422444
$CONTAINER_CLI rm -f sybase || true
423445
# Yup, that sucks, but on ubuntu we need to use -T11889 as per: https://github.com/DataGrip/docker-env/issues/12

settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ dependencyResolutionManagement {
230230
def hsqldbVersion = version "hsqldb", overrideableVersion( "gradle.libs.versions.hsqldb", "2.7.4" )
231231
def informixVersion = version "informix", "15.0.0.1.1"
232232
def mariadbVersion = version "mariadb", "3.5.5"
233-
def mssqlVersion = version "mssql", "12.10.1.jre11"
233+
def mssqlVersion = version "mssql", "13.2.0.jre11"
234234
def mysqlVersion = version "mysql", "9.4.0"
235235
def oracleVersion = version "oracle", "23.9.0.25.07"
236236
def oracleJacksonOsonExtension = version "oracleJacksonOsonExtension", "1.0.4"

0 commit comments

Comments
 (0)