Fix on connection string parsing for oracle/mysql.

Author: JaCraig

SQLHelper.SpeedTests/Tests/AltImplementations/HelperClasses/Connection.cs

@@ -66,10 +66,6 @@ public Connection(IConfiguration configuration, DbProviderFactory factory, strin
                     DatabaseName = DatabaseNameRegex.Match(ConnectionString).Groups[1].Value;
                     ParameterPrefix = "@";
                 }
-                else if (SourceType.Contains("MySql", StringComparison.OrdinalIgnoreCase))
-                {
-                    ParameterPrefix = "?";
-                }
                 else if (SourceType.Contains("Oracle", StringComparison.OrdinalIgnoreCase))
                 {
                     ParameterPrefix = ":";

src/SQLHelper.DB/HelperClasses/Connection.cs

@@ -58,8 +58,9 @@ public Connection(IConfiguration configuration, DbProviderFactory factory, strin
             Name = string.IsNullOrEmpty(name) ? "Default" : name;
             Factory = factory ?? SqlClientFactory.Instance;
             ConnectionString = !string.IsNullOrEmpty(connection) ? connection : (configuration.GetConnectionString(Name) ?? Name);
-            if (Factory is SqlClientFactory)
-                DatabaseName = DatabaseNameRegex.Match(ConnectionString).Groups[1].Value;
+            var DatabaseRegexResult = DatabaseNameRegex.Match(ConnectionString);
+            if (DatabaseRegexResult.Success)
+                DatabaseName = DatabaseRegexResult.Groups["name"].Value;
             ParameterPrefix = !string.IsNullOrEmpty(parameterPrefix) ? parameterPrefix : GetParameterPrefix(Factory);
             CommandTimeout = GetCommandTimeout(ConnectionString);
         }
@@ -115,7 +116,7 @@ public Connection(IConfiguration configuration, DbProviderFactory factory, strin
         /// Gets the database.
         /// </summary>
         /// <value>The database.</value>
-        private static Regex DatabaseNameRegex { get; } = new Regex("Initial Catalog=([^;]*)", RegexOptions.IgnoreCase | RegexOptions.Compiled);
+        private static Regex DatabaseNameRegex { get; } = new Regex("(Initial Catalog|Database|Data Source)=(?<name>[^;]*)", RegexOptions.IgnoreCase | RegexOptions.Compiled);
 
         /// <summary>
         /// Gets the command timeout.
@@ -140,12 +141,7 @@ private static int GetCommandTimeout(string connectionString)
         private static string GetParameterPrefix(DbProviderFactory factory)
         {
             var SourceType = factory.GetType().FullName ?? string.Empty;
-            if (SourceType.Contains("MySql", StringComparison.OrdinalIgnoreCase))
-                return "?";
-            else if (SourceType.Contains("Oracle", StringComparison.OrdinalIgnoreCase))
-                return ":";
-            else
-                return "@";
+            return SourceType.Contains("Oracle", StringComparison.OrdinalIgnoreCase) ? ":" : "@";
         }
     }
 }