From 1f719fff1855c0be6dc3b760c3e20fef074a04bb Mon Sep 17 00:00:00 2001
From: Esa Puttonen <esa.puttonen@nitor.com>
Date: Wed, 11 Sep 2024 18:08:34 +0300
Subject: [PATCH] Try to fix MS SQL Server integration tests (see:
 https://github.com/microsoft/mssql-docker/issues/892)

---
 scripts/setup-db-sqlserver.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/setup-db-sqlserver.sh b/scripts/setup-db-sqlserver.sh
index 6d6dc329d..48a131679 100755
--- a/scripts/setup-db-sqlserver.sh
+++ b/scripts/setup-db-sqlserver.sh
@@ -8,9 +8,11 @@ DB_VERSION=${DB_VERSION:-latest}
 case $DB_VERSION in
   old)
     DB_VERSION=2017-latest # supported until 2027
+    SQLCMD_EXEC=/opt/mssql-tools/bin/sqlcmd
     ;;
   latest)
     DB_VERSION=2022-latest
+    SQLCMD_EXEC="/opt/mssql-tools18/bin/sqlcmd -C"
     ;;
 esac
 
@@ -18,7 +20,7 @@ $tool run --pull=always  --rm --name mssql -e 'ACCEPT_EULA=Y' -e 'MSSQL_SA_PASSW
 
 grep -F -m1 'Recovery is complete' <(timeout 240 $tool logs -f mssql 2>&1)
 
-sqlcmd="$tool exec -t mssql /opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P passWord1% -e -x"
+sqlcmd="$tool exec -t mssql $SQLCMD_EXEC -S localhost -U sa -P passWord1% -e -x"
 $sqlcmd -Q "create database nflow"
 $sqlcmd -d nflow -Q "create login [nflow] with password='FC8%1knw', default_database=[nflow]"
 $sqlcmd -d nflow -Q "create user [nflow] for login [nflow] with default_schema=[nflow]"