add suport for Microsoft.Data.SqlClient

fixes #980
ErikEJ · Mar 19, 2024 · f28dbf2 · f28dbf2
1 parent bc7eb88
commit f28dbf2
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 3 deletions.
diff --git a/src/GUI/SqlCe35Toolbox/Helpers/DataConnectionHelper.cs b/src/GUI/SqlCe35Toolbox/Helpers/DataConnectionHelper.cs
@@ -124,7 +124,8 @@ internal static Dictionary<string, DatabaseInfo> GetDataConnections(SqlCeToolbox
                                     databaseList.Add(sConnectionString, info);
                             }
                         }
-                        if (includeServerConnections && objProviderGuid == new Guid(Resources.SqlServerDotNetProvider))
+                        if (includeServerConnections && objProviderGuid == new Guid(Resources.SqlServerDotNetProvider)
+                            || objProviderGuid == new Guid(Resources.MicrosoftSqlServerDotNetProvider))
                         {
                             var sConnectionString = DataProtection.DecryptString(connection.EncryptedConnectionString);
                             var info = new DatabaseInfo()

diff --git a/src/GUI/SqlCe35Toolbox/Helpers/RepositoryHelper.cs b/src/GUI/SqlCe35Toolbox/Helpers/RepositoryHelper.cs
@@ -16,7 +16,7 @@ internal static IRepository CreateRepository(DatabaseInfo databaseInfo)
                 case DatabaseType.SQLCE40:
                     return new DB4Repository(databaseInfo.ConnectionString);
                 case DatabaseType.SQLServer:
-                    return new ServerDBRepository(databaseInfo.ConnectionString, Properties.Settings.Default.KeepSchemaNames);
+                    return new ServerDBRepository(SqlConnectionStringBuilderHelper.GetBuilder(databaseInfo.ConnectionString).ConnectionString, Properties.Settings.Default.KeepSchemaNames);
                 case DatabaseType.SQLite:
                     return new SQLiteRepository(databaseInfo.ConnectionString);
                 default:
@@ -106,6 +106,22 @@ public static bool IsMissing(DatabaseInfo info)
             }
         }
 
+        internal static class SqlConnectionStringBuilderHelper
+        {
+            public static SqlConnectionStringBuilder GetBuilder(string connectionString)
+            {
+                connectionString = ReplaceMdsKeywords(connectionString);
+                return new SqlConnectionStringBuilder(connectionString);
+            }
+
+            private static string ReplaceMdsKeywords(string connectionString)
+            {
+                connectionString = connectionString.Replace("Multiple Active Result Sets=", "MultipleActiveResultSets=");
+                connectionString = connectionString.Replace("Trust Server Certificate=", "TrustServerCertificate=");
+                return connectionString;
+            }
+        }
+
         internal static bool IsV40Installed()
         {
             return new SqlCeHelper4().IsV40Installed() != null;

diff --git a/src/GUI/SqlCe35Toolbox/Resources.Designer.cs b/src/GUI/SqlCe35Toolbox/Resources.Designer.cs
diff --git a/src/GUI/SqlCe35Toolbox/Resources.resx b/src/GUI/SqlCe35Toolbox/Resources.resx
@@ -317,4 +317,7 @@ Storage size varies. It is the length of the value in bytes.</value>
   <data name="SqlitePrivateProvider" xml:space="preserve">
     <value>687EA40E-7B91-472A-9A58-2A3D43DE1ACE</value>
   </data>
+  <data name="MicrosoftSqlServerDotNetProvider" xml:space="preserve">
+    <value>8800600a-add9-47e8-81d2-1d13b5a09c13</value>
+  </data>
 </root>