DatabaseWrapper: First draft of achieving independency from locales

src/DatabaseWrapper.Core/DatabaseClientBase.cs

@@ -2,12 +2,15 @@
 using System.Collections.Generic;
 using System.Collections.Concurrent;
 using System.Data;
+using static System.FormattableString;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using DatabaseWrapper.Core;
 using ExpressionTree;
 using System.Threading;
+using System.Data.Common;
+using System.Runtime.InteropServices;
 
 namespace DatabaseWrapper.Core
 {
@@ -302,20 +305,37 @@ public abstract class DatabaseClientBase
         /// <param name="token">Cancellation token.</param>
         public abstract Task TruncateAsync(string tableName, CancellationToken token = default);
 
+        /// <summary>
+        /// Execute a query.
+        /// </summary>
+        /// <param name="queryAndParameters">A tuple of the aatabase query defined outside of the database client and query parameters.</param>
+        /// <returns>A DataTable containing the results.</returns>
+        public abstract DataTable Query((string Query, IEnumerable<KeyValuePair<string,object>> Parameters) queryAndParameters);
+
         /// <summary>
         /// Execute a query.
         /// </summary>
         /// <param name="query">Database query defined outside of the database client.</param>
         /// <returns>A DataTable containing the results.</returns>
-        public abstract DataTable Query(string query);
+        public DataTable Query(string query)
+            => Query((query, null));
+
+        /// <summary>
+        /// Execute a query.
+        /// </summary>
+        /// <param name="queryAndParameters">A tuple of the aatabase query defined outside of the database client and query parameters.</param>
+        /// <param name="token">Cancellation token.</param>
+        /// <returns>A DataTable containing the results.</returns>
+        public abstract Task<DataTable> QueryAsync((string Query, IEnumerable<KeyValuePair<string,object>> Parameters) queryAndParameters, CancellationToken token = default(CancellationToken));
 
         /// <summary>
         /// Execute a query.
         /// </summary>
         /// <param name="query">Database query defined outside of the database client.</param>
         /// <param name="token">Cancellation token.</param>
         /// <returns>A DataTable containing the results.</returns>
-        public abstract Task<DataTable> QueryAsync(string query, CancellationToken token = default);
+        public Task<DataTable> QueryAsync(string query, CancellationToken token = default(CancellationToken))
+            => QueryAsync((query, null), token);
 
         /// <summary>
         /// Determine if records exist by filter.

src/DatabaseWrapper.Mysql/DatabaseClient.cs

@@ -116,7 +116,28 @@ private set
         private string _CountColumnName = "__count__";
         private string _SumColumnName = "__sum__";
         private MysqlHelper _Helper = new MysqlHelper();
-
+
+        static readonly Dictionary<SqlDbType, MySqlDbType> DbTypeMapping = new Dictionary<SqlDbType, MySqlDbType>()
+        {
+            { SqlDbType.Int, MySqlDbType.Int32 },
+            { SqlDbType.BigInt, MySqlDbType.Int64 },
+            { SqlDbType.Float, MySqlDbType.Double },
+            { SqlDbType.UniqueIdentifier, MySqlDbType.Guid },
+            { SqlDbType.Image, MySqlDbType.Blob },
+            { SqlDbType.DateTimeOffset, MySqlDbType.DateTime },
+            { SqlDbType.NText, MySqlDbType.Text },
+            { SqlDbType.NVarChar, MySqlDbType.VarChar },
+            { SqlDbType.Bit, MySqlDbType.Bit },
+            { SqlDbType.DateTime, MySqlDbType.DateTime }
+        };
+
+        static MySqlParameter CreateMySqlParameter(string name, SqlDbType type)
+        {
+            var real_type = DbTypeMapping[type];
+            var r = new MySqlParameter(name, real_type);
+            return r;
+        }
+
         #endregion
 
         #region Constructors-and-Factories
@@ -794,10 +815,11 @@ public override async Task TruncateAsync(string tableName, CancellationToken tok
         /// <summary>
         /// Execute a query.
         /// </summary>
-        /// <param name="query">Database query defined outside of the database client.</param>
+        /// <param name="queryAndParameters">Database query defined outside of the database client, and, the corresponding parameters.</param>
         /// <returns>A DataTable containing the results.</returns>
-        public override DataTable Query(string query)
+        public override DataTable Query((string Query, IEnumerable<KeyValuePair<string,object>> Parameters) queryAndParameters)
         {
+            (var query, var parameters) = queryAndParameters;
             if (String.IsNullOrEmpty(query)) throw new ArgumentNullException(query);
             if (query.Length > MaxStatementLength) throw new ArgumentException("Query exceeds maximum statement length of " + MaxStatementLength + " characters.");
 
@@ -822,6 +844,7 @@ public override DataTable Query(string query)
                         cmd.CommandText = query;
 #pragma warning restore CA2100 // Review SQL queries for security vulnerabilities
 
+                        DatabaseHelperBase.AddParameters(cmd, CreateMySqlParameter, parameters);
                         using (MySqlDataAdapter sda = new MySqlDataAdapter(cmd))
                         {
                             DataSet ds = new DataSet();
@@ -872,11 +895,12 @@ public override DataTable Query(string query)
         /// <summary>
         /// Execute a query.
         /// </summary>
-        /// <param name="query">Database query defined outside of the database client.</param>
+        /// <param name="queryAndParameters">Database query defined outside of the database client, and, the corresponding parameters.</param>
         /// <param name="token">Cancellation token.</param>
         /// <returns>A DataTable containing the results.</returns>
-        public override async Task<DataTable> QueryAsync(string query, CancellationToken token = default)
+        public override async Task<DataTable> QueryAsync((string Query, IEnumerable<KeyValuePair<string,object>> Parameters) queryAndParameters, CancellationToken token = default)
         {
+            (var query, var parameters) = queryAndParameters;
             if (String.IsNullOrEmpty(query)) throw new ArgumentNullException(query);
             if (query.Length > MaxStatementLength) throw new ArgumentException("Query exceeds maximum statement length of " + MaxStatementLength + " characters.");
 
@@ -901,6 +925,7 @@ public override async Task<DataTable> QueryAsync(string query, CancellationToken
                         cmd.CommandText = query;
 #pragma warning restore CA2100 // Review SQL queries for security vulnerabilities
 
+                        DatabaseHelperBase.AddParameters(cmd, CreateMySqlParameter, parameters);
                         using (MySqlDataAdapter sda = new MySqlDataAdapter(cmd))
                         {
                             DataSet ds = new DataSet();