mysql ssl=None

EvilLord666 · Sep 29, 2021 · c3b3590 · c3b3590
1 parent c21bb32
commit c3b3590
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 9 deletions.
diff --git a/DbTools/DbTools.Simple.Tests/DbTools.Simple.Tests.csproj b/DbTools/DbTools.Simple.Tests/DbTools.Simple.Tests.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
  <PropertyGroup>
- <TargetFramework>netcoreapp2.2</TargetFramework>
+ <TargetFramework>net6.0</TargetFramework>
 
  <IsPackable>false</IsPackable>
  </PropertyGroup>
@@ -10,7 +10,7 @@
  <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
  <PackageReference Include="xunit" Version="2.4.0" />
  <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
- <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.2.0" />
+ <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.2.0" />
  <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="2.2.0" />
  </ItemGroup>
 

diff --git a/DbTools/DbTools.Simple.Tests/Extensions/TestDbManagerExtensions.cs b/DbTools/DbTools.Simple.Tests/Extensions/TestDbManagerExtensions.cs
@@ -13,16 +13,20 @@ namespace DbTools.Simple.Tests.Extensions
  public class TestDbManagerExtensions
  {
  [Theory]
- [InlineData(DbEngine.SqlServer, true, "", "")]
- [InlineData(DbEngine.MySql, false, "root", "123")]
- [InlineData(DbEngine.SqLite, false, "", "")]
- [InlineData(DbEngine.PostgresSql, false, "postgres", "123")]
- public void TestCreate(DbEngine dbEngine, bool integratedSecurity, string userName, string password)
+ [InlineData(DbEngine.SqlServer, true, "", "", true)]
+ [InlineData(DbEngine.SqlServer, true, "", "", false)]
+ [InlineData(DbEngine.MySql, false, "root", "123", true)]
+ [InlineData(DbEngine.MySql, false, "root", "123", false)]
+ [InlineData(DbEngine.SqLite, false, "", "", true)]
+ [InlineData(DbEngine.SqLite, false, "", "", false)]
+ [InlineData(DbEngine.PostgresSql, false, "postgres", "123", true)]
+ [InlineData(DbEngine.PostgresSql, false, "postgres", "123", false)]
+ public void TestCreate(DbEngine dbEngine, bool integratedSecurity, string userName, string password, bool useScripts)
  {
  IDbManager dbManager = DbManagerFactory.Create(dbEngine, _loggerFactory);
  Tuple<string, string> hostAndName = _hostAndDatabaseOptions[dbEngine];
  string connectionString = dbManager.Create(dbEngine, hostAndName.Item1, hostAndName.Item2,
- integratedSecurity, userName, password, _scripts);
+ integratedSecurity, userName, password, useScripts ? _scripts: new List<string>());
  Assert.NotNull(connectionString);
  bool result = dbManager.DropDatabase(connectionString);
  Assert.True(result);

diff --git a/DbTools/DbTools.Simple/Utils/ConnectionStringBuilder.cs b/DbTools/DbTools.Simple/Utils/ConnectionStringBuilder.cs
@@ -75,6 +75,7 @@ private static string BuildMysqlConnectionString(IDictionary<string, string> par
  builder.Password = parameters[DbParametersKeys.PasswordKey];
  builder.ConnectionLifeTime = 60;
  builder.ConnectionTimeout = 60;
+ builder.SslMode = MySqlSslMode.None;
  return builder.ConnectionString;
  }