Fix Sql Server provider

SwissLife-OSS · Aug 27, 2024 · 506855b · 506855b
1 parent 97596c4
commit 506855b
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 21 deletions.
diff --git a/src/SqlServer.Tests/Resources/SqlServer2019Options.cs b/src/SqlServer.Tests/Resources/SqlServer2019Options.cs
@@ -13,7 +13,8 @@ public class SqlServer2019Options : ContainerResourceOptions
         /// <param name="builder"></param>
         public override void Configure(ContainerResourceBuilder builder)
         {
-            var password = "_Qtp" + Guid.NewGuid().ToString("N");
+            // var password = "Qtp!" + Guid.NewGuid().ToString("N").Substring(0,6);
+            var password = "Qtp!" + Guid.NewGuid().ToString("N").Substring(0,6);
             builder
                 .Name("mssql")
                 .Image("mcr.microsoft.com/mssql/server:2019-latest")
@@ -22,7 +23,7 @@ public override void Configure(ContainerResourceBuilder builder)
                 .Password(password)
                 .WaitTimeout(60 * 5)
                 .AddEnvironmentVariable("ACCEPT_EULA=Y")
-                .AddEnvironmentVariable($"SA_PASSWORD={password}");
+                .AddEnvironmentVariable($"MSSQL_SA_PASSWORD={password}");
         }
     }
 }
diff --git a/src/SqlServer/SqlCommand.cs b/src/SqlServer/SqlCommand.cs
@@ -11,8 +11,8 @@ private SqlCommand(
             string command,
             ContainerResourceSettings settings)
         {
-            _command.Append("/opt/mssql-tools/bin/sqlcmd ");
-            _command.Append($"-S localhost -U {settings.Username} -P {settings.Password} ");
+            _command.Append("/opt/mssql-tools18/bin/sqlcmd ");
+            _command.Append($"-S localhost -U {settings.Username} -P {settings.Password} -C ");
             _command.Append(command);
         }
 

diff --git a/src/SqlServer/SqlServerResource.cs b/src/SqlServer/SqlServerResource.cs
@@ -20,17 +20,17 @@ public partial class SqlServerResource<TOptions>
           IAsyncLifetime
         where TOptions : ContainerResourceOptions, new()
     {
-        /// <summary>
-        /// Sync lock
-        /// </summary>
+        /// <summary>
+        /// Sync lock
+        /// </summary>
         protected readonly SemaphoreSlim _sync = new SemaphoreSlim(1,1);
-        /// <summary>
-        /// The databases
-        /// </summary>
+        /// <summary>
+        /// The databases
+        /// </summary>
         protected readonly HashSet<string> _databases = new HashSet<string>();
-        /// <summary>
-        /// The SqlServer connection string
-        /// </summary>
+        /// <summary>
+        /// The SqlServer connection string
+        /// </summary>
         protected string _serverConnectionString;
 
         /// <inheritdoc cref="IAsyncLifetime"/>
@@ -101,10 +101,10 @@ private async Task<string> CreateDatabaseInternalAsync(string sqlScript, string
 
                 await Manager.CopyToContainerAsync(copyContext);
 
-                await Manager.InvokeCommandAsync(
+                var invoke1= await Manager.InvokeCommandAsync(
                     ChmodCommand.ReadWrite($"/tmp/{scriptFile.Name}"));
 
-                await Manager.InvokeCommandAsync(
+                var invoke2= await Manager.InvokeCommandAsync(
                     SqlCommand.ExecuteFile(copyContext.Destination, Settings));
 
                 _databases.Add(databaseName);
@@ -158,11 +158,11 @@ await Manager.InvokeCommandAsync(
             }
         }
 
-        /// <summary>
-        /// Creates the database connection string.
-        /// </summary>
-        /// <param name="databaseName">Name of the database.</param>
-        /// <returns></returns>
+        /// <summary>
+        /// Creates the database connection string.
+        /// </summary>
+        /// <param name="databaseName">Name of the database.</param>
+        /// <returns></returns>
         protected string CreateDatabaseConnectionString(string databaseName)
             => $"{_serverConnectionString}Database={databaseName}";
 
@@ -173,7 +173,7 @@ private string CreateServerConnectionString()
                 .Append($"User ID={Settings.Username};")
                 .Append($"Password={Settings.Password};")
                 .Append("MultipleActiveResultSets=True;")
-                .Append("TrustServerCertificate=True;")
+                .Append("Encrypt=no;")
                 .ToString();
 
         internal async Task DeployAndExecute(string sqlScript)