Merge pull request #1459 from tsegismont/re-enable-mssql-ci-4x

Re-enable MSSQL in CI (4.x)

Author: vietj

.github/workflows/ci-4.x.yml

@@ -16,9 +16,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        # profile: [PostgreSQL-9,PostgreSQL-10,PostgreSQL-11,MySQL-8.0,MySQL-5.6,MySQL-5.7,MariaDB-10.4,MSSQL-2017-latest,MSSQL-2019-latest,DB2-11.5,Oracle-23,SQL-templates]
-        # Removed MSSQL that fails in CI docker
-        profile: [PostgreSQL-9,PostgreSQL-10,PostgreSQL-11,MySQL-8.0,MySQL-5.6,MySQL-5.7,MariaDB-10.4,DB2-11.5,Oracle-23,SQL-templates]
+        profile: [PostgreSQL-9,PostgreSQL-10,PostgreSQL-11,MySQL-8.0,MySQL-5.6,MySQL-5.7,MariaDB-10.4,MSSQL-2017-latest,MSSQL-2019-latest,DB2-11.5,Oracle-23,SQL-templates]
         jdk: [8, 17]
         exclude:
           - profile: Oracle-23

vertx-mssql-client/docker/docker-compose.yml

@@ -10,14 +10,14 @@ services:
       TZ: UTC
       SA_PASSWORD: A_Str0ng_Required_Password
   test-mssql-initdb:
-    image: mcr.microsoft.com/mssql-tools
+    image: mcr.microsoft.com/mssql/server:${MSSQL_VERSION:-2019-latest}
     depends_on:
       - "test-mssql"
-    command: [ "sh", "/opt/mssql-tools/bin/initdb.sh","test-mssql,1433","A_Str0ng_Required_Password","/opt/data/init.sql" ]
+    command: [ "sh", "/opt/mssql-tools18/bin/initdb.sh","test-mssql,1433","A_Str0ng_Required_Password","/opt/data/init.sql" ]
     volumes:
       - type: bind
         source: ./initdb.sh
-        target: /opt/mssql-tools/bin/initdb.sh
+        target: /opt/mssql-tools18/bin/initdb.sh
         read_only: true
       - type: bind
         source: ../src/test/resources/init.sql

vertx-mssql-client/docker/initdb.sh

@@ -6,10 +6,10 @@ SERVER="$1"
 PASSWORD="$2"
 SQL_FILE="$3"
 
-until /opt/mssql-tools/bin/sqlcmd -l 1 -S $SERVER -U SA -P $PASSWORD -q "SELECT 1"; do
+until /opt/mssql-tools18/bin/sqlcmd -l 1 -S $SERVER -U SA -P $PASSWORD -C -No -q "SELECT 1"; do
   >&2 echo "MSSQL is unavailable - sleeping"
   sleep 1
 done
 
 >&2 echo "MSSQL is up - executing command"
-/opt/mssql-tools/bin/sqlcmd -S $SERVER -U SA -P $PASSWORD -i $SQL_FILE
+/opt/mssql-tools18/bin/sqlcmd -S $SERVER -U SA -P $PASSWORD -i $SQL_FILE -C -No

vertx-mssql-client/src/test/java/io/vertx/mssqlclient/junit/MSSQLRule.java

@@ -115,11 +115,12 @@ private MSSQLConnectOptions startMSSQL() throws IOException {
   private void initDb() throws IOException {
     try {
       ExecResult execResult = server.execInContainer(
-        "/opt/mssql-tools/bin/sqlcmd",
+        "/opt/mssql-tools18/bin/sqlcmd",
         "-S", "localhost",
         "-U", USER,
         "-P", PASSWORD,
-        "-i", INIT_SQL
+        "-i", INIT_SQL,
+        "-C", "-No"
       );
       if (execResult.getExitCode() != 0) {
         throw new RuntimeException(String.format("Failure while initializing database%nstdout:%s%nstderr:%s%n", execResult.getStdout(), execResult.getStderr()));