From 3170300b7d2f6ab76ad2975ff02aacbc50a8fb95 Mon Sep 17 00:00:00 2001
From: Paul Black <paulrblack.prb@gmail.com>
Date: Thu, 6 Mar 2025 20:24:45 -0700
Subject: [PATCH] Swapped to MySqlConnector, fixes support for MariaDB, and is
 generally faster at running queries than MySql.Data.MySqlClient.

---
 WDBXEditor/App.config                        | 12 ++++++++
 WDBXEditor/ConsoleHandler/ConsoleCommands.cs |  2 +-
 WDBXEditor/Forms/LoadSQL.cs                  |  2 +-
 WDBXEditor/Forms/WotLKItemFix.cs             |  2 +-
 WDBXEditor/Storage/DBEntry.cs                |  2 +-
 WDBXEditor/WDBXEditor.csproj                 | 31 ++++++++++++++++++++
 WDBXEditor/packages.config                   | 10 +++++++
 7 files changed, 57 insertions(+), 4 deletions(-)

diff --git a/WDBXEditor/App.config b/WDBXEditor/App.config
index 1c24d60..97c2303 100644
--- a/WDBXEditor/App.config
+++ b/WDBXEditor/App.config
@@ -61,4 +61,16 @@
       <add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=6.9.9.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
     </DbProviderFactories>
   </system.data>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
 </configuration>
\ No newline at end of file
diff --git a/WDBXEditor/ConsoleHandler/ConsoleCommands.cs b/WDBXEditor/ConsoleHandler/ConsoleCommands.cs
index b33661d..834bd71 100644
--- a/WDBXEditor/ConsoleHandler/ConsoleCommands.cs
+++ b/WDBXEditor/ConsoleHandler/ConsoleCommands.cs
@@ -1,4 +1,4 @@
-using MySql.Data.MySqlClient;
+using MySqlConnector;
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
diff --git a/WDBXEditor/Forms/LoadSQL.cs b/WDBXEditor/Forms/LoadSQL.cs
index 989f7ce..7d9ece9 100644
--- a/WDBXEditor/Forms/LoadSQL.cs
+++ b/WDBXEditor/Forms/LoadSQL.cs
@@ -1,5 +1,5 @@
 using WDBXEditor.Storage;
-using MySql.Data.MySqlClient;
+using MySqlConnector;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
diff --git a/WDBXEditor/Forms/WotLKItemFix.cs b/WDBXEditor/Forms/WotLKItemFix.cs
index f2b6730..fa1cd79 100644
--- a/WDBXEditor/Forms/WotLKItemFix.cs
+++ b/WDBXEditor/Forms/WotLKItemFix.cs
@@ -1,5 +1,5 @@
 using WDBXEditor.Storage;
-using MySql.Data.MySqlClient;
+using MySqlConnector;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
diff --git a/WDBXEditor/Storage/DBEntry.cs b/WDBXEditor/Storage/DBEntry.cs
index 25c9b28..d584dca 100644
--- a/WDBXEditor/Storage/DBEntry.cs
+++ b/WDBXEditor/Storage/DBEntry.cs
@@ -1,6 +1,6 @@
 using WDBXEditor.Common;
 using WDBXEditor.Reader;
-using MySql.Data.MySqlClient;
+using MySqlConnector;
 using WDBXEditor.Archives.MPQ;
 using System;
 using System.Collections.Generic;
diff --git a/WDBXEditor/WDBXEditor.csproj b/WDBXEditor/WDBXEditor.csproj
index a6e14ae..f30c355 100644
--- a/WDBXEditor/WDBXEditor.csproj
+++ b/WDBXEditor/WDBXEditor.csproj
@@ -103,20 +103,51 @@
   </PropertyGroup>
   <PropertyGroup />
   <ItemGroup>
+    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\netstandard2.0\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=8.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.8.0.2\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=8.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.8.0.2\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
+    </Reference>
     <Reference Include="MySql.Data, Version=6.9.9.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
       <HintPath>..\packages\MySql.Data.6.9.9\lib\net45\MySql.Data.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="MySqlConnector, Version=2.0.0.0, Culture=neutral, PublicKeyToken=d33d3e53aa5f8c92, processorArchitecture=MSIL">
+      <HintPath>..\packages\MySqlConnector.2.4.0\lib\netstandard2.0\MySqlConnector.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
+    </Reference>
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Diagnostics.DiagnosticSource, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Diagnostics.DiagnosticSource.8.0.1\lib\netstandard2.0\System.Diagnostics.DiagnosticSource.dll</HintPath>
+    </Reference>
     <Reference Include="System.IO.Compression" />
     <Reference Include="System.IO.Compression.FileSystem" />
+    <Reference Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Numerics" />
+    <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    </Reference>
     <Reference Include="System.Threading.Tasks.Dataflow, Version=4.6.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Threading.Tasks.Dataflow.4.7.0\lib\portable-net45+win8+wpa81\System.Threading.Tasks.Dataflow.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
+    </Reference>
     <Reference Include="System.Transactions" />
     <Reference Include="System.Web.Extensions" />
     <Reference Include="System.Xml.Linq" />
diff --git a/WDBXEditor/packages.config b/WDBXEditor/packages.config
index 7455bec..154e481 100644
--- a/WDBXEditor/packages.config
+++ b/WDBXEditor/packages.config
@@ -1,5 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="Microsoft.Bcl.AsyncInterfaces" version="8.0.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="8.0.2" targetFramework="net461" />
+  <package id="Microsoft.Extensions.Logging.Abstractions" version="8.0.2" targetFramework="net461" />
   <package id="MySql.Data" version="6.9.9" targetFramework="net461" />
+  <package id="MySqlConnector" version="2.4.0" targetFramework="net461" />
+  <package id="System.Buffers" version="4.5.1" targetFramework="net461" />
+  <package id="System.Diagnostics.DiagnosticSource" version="8.0.1" targetFramework="net461" />
+  <package id="System.Memory" version="4.5.5" targetFramework="net461" />
+  <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net461" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net461" />
   <package id="System.Threading.Tasks.Dataflow" version="4.7.0" targetFramework="net461" />
+  <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net461" />
 </packages>
\ No newline at end of file