Replace MySql.Data with MySqlConnector

Dawn-of-Light · Oct 31, 2021 · dcc95de · dcc95de
2 parents b090e23 + a93ec13
commit dcc95de
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 4 deletions.
diff --git a/DOLDatabase/DOLDatabase.csproj b/DOLDatabase/DOLDatabase.csproj
@@ -60,7 +60,7 @@
   <ItemGroup>
     <PackageReference Include="log4net" Version="2.0.12" PrivateAssets="all" />
     <PackageReference Include="Microsoft.Data.Sqlite" Version="5.0.11" />
-    <PackageReference Include="MySql.Data" Version="8.0.26" PrivateAssets="all" />
+    <PackageReference Include="MySqlConnector" Version="1.3.14" PrivateAssets="all" />
   </ItemGroup>
   <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
 </Project>
diff --git a/DOLDatabase/Handlers/MySQLObjectDatabase.cs b/DOLDatabase/Handlers/MySQLObjectDatabase.cs
@@ -23,7 +23,7 @@
 using System.Data;
 using System.Data.Common;
 
-using MySql.Data.MySqlClient;
+using MySqlConnector;
 
 using DOL.Database.Connection;
 

diff --git a/Net5/DOLDatabase/DOLDatabase.csproj b/Net5/DOLDatabase/DOLDatabase.csproj
@@ -40,7 +40,7 @@
   <ItemGroup>
     <PackageReference Include="log4net" Version="2.0.12" />
     <PackageReference Include="Microsoft.Data.Sqlite" Version="5.0.11" />
-    <PackageReference Include="MySql.Data" Version="8.0.26" />
+    <PackageReference Include="MySqlConnector" Version="1.3.14" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\..\DOLDatabase\**\*.cs" />

diff --git a/Tests/IntegrationTests/Database/DatabaseTests.cs b/Tests/IntegrationTests/Database/DatabaseTests.cs
@@ -1157,5 +1157,40 @@ public void TestTableRelationWithPrecacheAndPrimaryRemote()
 
 			Assert.IsNull(relretrieve.Entry, "Relations Test With Precache and Primary should return null value for null local field relation...");
 		}
+
+		[Test]
+		public void SelectObject_TestFieldContainsSpecialISO88591signs_TestfieldIsUnaltered()
+		{
+			Database.RegisterDataObject(typeof(TestTable));
+			var dataObject = new TestTable();
+			dataObject.TestField = "¡¢£¤¥¦§¨©ª«¬®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿ";
+
+			AddOrReplaceObject(dataObject);
+
+			var actual = Database.FindObjectByKey<TestTable>(dataObject.ObjectId).TestField;
+			var expected = dataObject.TestField;
+			Assert.AreEqual(expected, actual);
+		}
+
+		[Test]
+		public void SelectObject_TestFieldContainsSpecialCp1252signs_TestfieldIsUnaltered()
+		{
+			Database.RegisterDataObject(typeof(TestTable));
+			var dataObject = new TestTable();
+			dataObject.TestField = "€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ";
+
+			AddOrReplaceObject(dataObject);
+
+			var actual = Database.FindObjectByKey<TestTable>(dataObject.ObjectId).TestField;
+			var expected = dataObject.TestField;
+			Assert.AreEqual(expected, actual);
+		}
+
+		private void AddOrReplaceObject<T>(T dataObject) where T : DataObject
+		{
+			var dataObjectFromDatabase = Database.FindObjectByKey<T>(dataObject.ObjectId);
+			if (dataObjectFromDatabase != null) Database.DeleteObject(dataObject);
+			Database.AddObject(dataObject);
+		}
 	}
 }
diff --git a/Tests/IntegrationTests/Database/MySQLDBSetUp.cs b/Tests/IntegrationTests/Database/MySQLDBSetUp.cs
@@ -27,7 +27,7 @@
 
 namespace DOL.Integration.Database.MySQL
 {
-	[SetUpFixture]
+	[SetUpFixture, Explicit]
 	public class MySQLDBSetUp
 	{
 		public MySQLDBSetUp()