Merge pull request #564 from johelvisguzman/issue561

Simplified ado.net context mapper

Author: johelvisguzman

src/DotNetToolkit.Repository.AdoNet/DbHelper.cs

@@ -428,37 +428,18 @@ public T ExecuteObject<T>(string cmdText, Dictionary<string, object> parameters,
         /// <param name="parameters">The command parameters.</param>
         /// <param name="projector">A function to project each entity into a new form.</param>
         /// <returns>A list which each entity has been projected into a new form.</returns>
-        internal IPagedQueryResult<IEnumerable<T>> ExecuteList<T>(string cmdText, CommandType cmdType, Dictionary<string, object> parameters, Func<DbDataReader, T> projector)
+        internal IEnumerable<T> ExecuteList<T>(string cmdText, CommandType cmdType, Dictionary<string, object> parameters, Func<DbDataReader, T> projector)
         {
             using (var reader = ExecuteReader(cmdText, cmdType, parameters))
             {
                 var list = new List<T>();
-                var foundCrossJoinCountColumn = false;
-                var total = 0;
-
-                QueryBuilder.ExtractCrossJoinColumnName(cmdText, out var crossJoinColumnName);
 
                 while (reader.Read())
                 {
-                    for (var i = 0; i < reader.FieldCount; i++)
-                    {
-                        var name = reader.GetName(i);
-
-                        if (!string.IsNullOrEmpty(crossJoinColumnName) && name.Equals(crossJoinColumnName))
-                        {
-                            total = (int)reader[name];
-                            foundCrossJoinCountColumn = true;
-                            break;
-                        }
-                    }
-
                     list.Add(projector(reader));
                 }
 
-                if (!foundCrossJoinCountColumn)
-                    total = list.Count;
-
-                return new PagedQueryResult<IEnumerable<T>>(list, total);
+                return list;
             }
         }
 
@@ -470,25 +451,11 @@ internal IPagedQueryResult<IEnumerable<T>> ExecuteList<T>(string cmdText, Comman
         /// <param name="parameters">The command parameters.</param>
         /// <param name="projector">A function to project each entity into a new form.</param>
         /// <returns>A list which each entity has been projected into a new form.</returns>
-        internal IPagedQueryResult<IEnumerable<T>> ExecuteList<T>(string cmdText, Dictionary<string, object> parameters, Func<DbDataReader, T> projector)
+        internal IEnumerable<T> ExecuteList<T>(string cmdText, Dictionary<string, object> parameters, Func<DbDataReader, T> projector)
         {
             return ExecuteList<T>(cmdText, CommandType.Text, parameters, projector);
         }
 
-        /// <summary>
-        /// Executes the query, and returns a list which each entity has been projected into a new form.
-        /// </summary>
-        /// <typeparam name="T">The type of the result set returned by the query.</typeparam>
-        /// <param name="cmdText">The command text.</param>
-        /// <param name="parameters">The command parameters.</param>
-        /// <returns>A list which each entity has been projected into a new form.</returns>
-        internal IPagedQueryResult<IEnumerable<T>> ExecuteList<T>(string cmdText, Dictionary<string, object> parameters) where T : class
-        {
-            var mapper = new Mapper<T>(_conventions);
-
-            return ExecuteList<T>(cmdText, parameters, mapper.Map);
-        }
-
         /// <summary>
         /// Executes the query, and returns a list which each entity has been projected into a new form.
         /// </summary>
@@ -497,7 +464,7 @@ internal IPagedQueryResult<IEnumerable<T>> ExecuteList<T>(string cmdText, Dictio
         /// <param name="cmdType">The command type.</param>
         /// <param name="projector">A function to project each entity into a new form.</param>
         /// <returns>A list which each entity has been projected into a new form.</returns>
-        internal IPagedQueryResult<IEnumerable<T>> ExecuteList<T>(string cmdText, CommandType cmdType, Func<DbDataReader, T> projector)
+        internal IEnumerable<T> ExecuteList<T>(string cmdText, CommandType cmdType, Func<DbDataReader, T> projector)
         {
             return ExecuteList<T>(cmdText, cmdType, null, projector);
         }
@@ -960,37 +927,18 @@ public DataSet ExecuteDataSet(string cmdText, Dictionary<string, object> paramet
         /// <param name="projector">A function to project each entity into a new form.</param>
         /// <param name="cancellationToken">A <see cref="System.Threading.CancellationToken" /> to observe while waiting for the task to complete.</param>
         /// <returns>The <see cref="System.Threading.Tasks.Task" /> that represents the asynchronous operation, containing a list which each entity has been projected into a new form.</returns>
-        internal async Task<IPagedQueryResult<IEnumerable<T>>> ExecuteListAsync<T>(string cmdText, CommandType cmdType, Dictionary<string, object> parameters, Func<DbDataReader, T> projector, CancellationToken cancellationToken = new CancellationToken())
+        internal async Task<IEnumerable<T>> ExecuteListAsync<T>(string cmdText, CommandType cmdType, Dictionary<string, object> parameters, Func<DbDataReader, T> projector, CancellationToken cancellationToken = new CancellationToken())
         {
             using (var reader = await ExecuteReaderAsync(cmdText, cmdType, parameters, cancellationToken))
             {
                 var list = new List<T>();
-                var foundCrossJoinCountColumn = false;
-                var total = 0;
-
-                QueryBuilder.ExtractCrossJoinColumnName(cmdText, out var crossJoinColumnName);
 
-                while (reader.Read())
+                while (await reader.ReadAsync(cancellationToken))
                 {
-                    for (var i = 0; i < reader.FieldCount; i++)
-                    {
-                        var name = reader.GetName(i);
-
-                        if (!string.IsNullOrEmpty(crossJoinColumnName) && name.Equals(crossJoinColumnName))
-                        {
-                            total = (int)reader[name];
-                            foundCrossJoinCountColumn = true;
-                            break;
-                        }
-                    }
-
                     list.Add(projector(reader));
                 }
 
-                if (!foundCrossJoinCountColumn)
-                    total = list.Count;
-
-                return new PagedQueryResult<IEnumerable<T>>(list, total);
+                return list;
             }
         }
 
@@ -1003,26 +951,11 @@ public DataSet ExecuteDataSet(string cmdText, Dictionary<string, object> paramet
         /// <param name="projector">A function to project each entity into a new form.</param>
         /// <param name="cancellationToken">A <see cref="System.Threading.CancellationToken" /> to observe while waiting for the task to complete.</param>
         /// <returns>The <see cref="System.Threading.Tasks.Task" /> that represents the asynchronous operation, containing a list which each entity has been projected into a new form.</returns>
-        internal Task<IPagedQueryResult<IEnumerable<T>>> ExecuteListAsync<T>(string cmdText, Dictionary<string, object> parameters, Func<DbDataReader, T> projector, CancellationToken cancellationToken = new CancellationToken())
+        internal Task<IEnumerable<T>> ExecuteListAsync<T>(string cmdText, Dictionary<string, object> parameters, Func<DbDataReader, T> projector, CancellationToken cancellationToken = new CancellationToken())
         {
             return ExecuteListAsync<T>(cmdText, CommandType.Text, parameters, projector, cancellationToken);
         }
 
-        /// <summary>
-        /// Asynchronously executes the query, and returns a list which each entity has been projected into a new form.
-        /// </summary>
-        /// <typeparam name="T">The type of the result set returned by the query.</typeparam>
-        /// <param name="cmdText">The command text.</param>
-        /// <param name="parameters">The command parameters.</param>
-        /// <param name="cancellationToken">A <see cref="System.Threading.CancellationToken" /> to observe while waiting for the task to complete.</param>
-        /// <returns>The <see cref="System.Threading.Tasks.Task" /> that represents the asynchronous operation, containing a list which each entity has been projected into a new form.</returns>
-        internal Task<IPagedQueryResult<IEnumerable<T>>> ExecuteListAsync<T>(string cmdText, Dictionary<string, object> parameters, CancellationToken cancellationToken = new CancellationToken()) where T : class
-        {
-            var mapper = new Mapper<T>(_conventions);
-
-            return ExecuteListAsync<T>(cmdText, parameters, mapper.Map, cancellationToken);
-        }
-
         /// <summary>
         /// Asynchronously executes the query, and returns a new <see cref="Dictionary{TDictionaryKey, TElement}" /> according to the specified <paramref name="keyProjector" />, and <paramref name="elementProjector" />.
         /// </summary>

src/DotNetToolkit.Repository.AdoNet/Internal/AdoNetRepositoryContext.cs

@@ -395,14 +395,13 @@ public TEntity Find<TEntity>(IFetchQueryStrategy<TEntity> fetchStrategy, params
                 fetchStrategy != null,
                 out var sql,
                 out var parameters,
-                out var navigationProperties,
-                out var getPropertyFromColumnAliasCallback);
+                out var mappingProperties);
 
-            var mapper = new Mapper<TEntity>(Conventions, navigationProperties, getPropertyFromColumnAliasCallback);
+            var mapper = new Mapper<TEntity>(Conventions, mappingProperties);
 
             ExecuteSchemaValidate(typeof(TEntity));
 
-            return _dbHelper.ExecuteObject<TEntity>(sql, parameters, r => mapper.Map<TEntity>(r, selectorFunc));
+            return _dbHelper.ExecuteObject<TEntity>(sql, parameters, r => selectorFunc(mapper.Map(r)));
         }
 
         /// <summary>
@@ -424,14 +423,13 @@ public TResult Find<TEntity, TResult>(IQueryOptions<TEntity> options, Expression
                 options,
                 out var sql,
                 out var parameters,
-                out var navigationProperties,
-                out var getPropertyFromColumnAliasCallback);
+                out var mappingProperties);
 
-            var mapper = new Mapper<TEntity>(Conventions, navigationProperties, getPropertyFromColumnAliasCallback);
+            var mapper = new Mapper<TEntity>(Conventions, mappingProperties);
 
             ExecuteSchemaValidate(typeof(TEntity));
 
-            return _dbHelper.ExecuteObject<TResult>(sql, parameters, r => mapper.Map<TResult>(r, selectorFunc));
+            return _dbHelper.ExecuteObject<TResult>(sql, parameters, r => selectorFunc(mapper.Map(r)));
         }
 
         /// <summary>
@@ -453,14 +451,42 @@ public IPagedQueryResult<IEnumerable<TResult>> FindAll<TEntity, TResult>(IQueryO
                 options,
                 out var sql,
                 out var parameters,
-                out var navigationProperties,
-                out var getPropertyFromColumnAliasCallback);
+                out var mappingProperties);
 
-            var mapper = new Mapper<TEntity>(Conventions, navigationProperties, getPropertyFromColumnAliasCallback);
+            var mapper = new Mapper<TEntity>(Conventions, mappingProperties);
 
             ExecuteSchemaValidate(typeof(TEntity));
 
-            return _dbHelper.ExecuteList<TResult>(sql, parameters, r => mapper.Map<TResult>(r, selectorFunc));
+            using (var reader = _dbHelper.ExecuteReader(sql, parameters))
+            {
+                var list = new List<TResult>();
+                var foundCrossJoinCountColumn = false;
+                var total = 0;
+
+                QueryBuilder.ExtractCrossJoinColumnName(sql, out var crossJoinColumnName);
+
+                while (reader.Read())
+                {
+                    for (var i = 0; i < reader.FieldCount; i++)
+                    {
+                        var name = reader.GetName(i);
+
+                        if (!string.IsNullOrEmpty(crossJoinColumnName) && name.Equals(crossJoinColumnName))
+                        {
+                            total = (int)reader[name];
+                            foundCrossJoinCountColumn = true;
+                            break;
+                        }
+                    }
+
+                    list.Add(selectorFunc(mapper.Map(reader)));
+                }
+
+                if (!foundCrossJoinCountColumn)
+                    total = list.Count;
+
+                return new PagedQueryResult<IEnumerable<TResult>>(list, total);
+            }
         }
 
         /// <summary>
@@ -530,10 +556,9 @@ public IPagedQueryResult<Dictionary<TDictionaryKey, TElement>> ToDictionary<TEnt
                 options,
                 out var sql,
                 out var parameters,
-                out var navigationProperties,
-                out var getPropertyFromColumnAliasCallback);
+                out var mappingProperties);
 
-            var mapper = new Mapper<TEntity>(Conventions, navigationProperties, getPropertyFromColumnAliasCallback);
+            var mapper = new Mapper<TEntity>(Conventions, mappingProperties);
 
             ExecuteSchemaValidate(typeof(TEntity));
 
@@ -559,7 +584,9 @@ public IPagedQueryResult<Dictionary<TDictionaryKey, TElement>> ToDictionary<TEnt
                         }
                     }
 
-                    dict.Add(mapper.Map<TDictionaryKey>(reader, keySelectFunc), mapper.Map<TElement>(reader, elementSelectorFunc));
+                    var mapped = mapper.Map(reader);
+
+                    dict.Add(keySelectFunc(mapped), elementSelectorFunc(mapped));
                 }
 
                 if (!foundCrossJoinCountColumn)
@@ -740,14 +767,13 @@ public async Task<TEntity> FindAsync<TEntity>(CancellationToken cancellationToke
                 fetchStrategy != null,
                 out var sql,
                 out var parameters,
-                out var navigationProperties,
-                out var getPropertyFromColumnAliasCallback);
+                out var mappingProperties);
 
-            var mapper = new Mapper<TEntity>(Conventions, navigationProperties, getPropertyFromColumnAliasCallback);
+            var mapper = new Mapper<TEntity>(Conventions, mappingProperties);
 
             await ExecuteSchemaValidateAsync(typeof(TEntity), cancellationToken);
 
-            return await _dbHelper.ExecuteObjectAsync<TEntity>(sql, parameters, r => mapper.Map<TEntity>(r, selectorFunc), cancellationToken);
+            return await _dbHelper.ExecuteObjectAsync<TEntity>(sql, parameters, r => selectorFunc(mapper.Map(r)), cancellationToken);
         }
 
         /// <summary>
@@ -770,14 +796,13 @@ public async Task<TEntity> FindAsync<TEntity>(CancellationToken cancellationToke
                 options,
                 out var sql,
                 out var parameters,
-                out var navigationProperties,
-                out var getPropertyFromColumnAliasCallback);
+                out var mappingProperties);
 
-            var mapper = new Mapper<TEntity>(Conventions, navigationProperties, getPropertyFromColumnAliasCallback);
+            var mapper = new Mapper<TEntity>(Conventions, mappingProperties);
 
             await ExecuteSchemaValidateAsync(typeof(TEntity), cancellationToken);
 
-            return await _dbHelper.ExecuteObjectAsync<TResult>(sql, parameters, r => mapper.Map<TResult>(r, selectorFunc), cancellationToken);
+            return await _dbHelper.ExecuteObjectAsync<TResult>(sql, parameters, r => selectorFunc(mapper.Map(r)), cancellationToken);
         }
 
         /// <summary>
@@ -800,14 +825,42 @@ public async Task<TEntity> FindAsync<TEntity>(CancellationToken cancellationToke
                 options,
                 out var sql,
                 out var parameters,
-                out var navigationProperties,
-                out var getPropertyFromColumnAliasCallback);
+                out var mappingProperties);
 
-            var mapper = new Mapper<TEntity>(Conventions, navigationProperties, getPropertyFromColumnAliasCallback);
+            var mapper = new Mapper<TEntity>(Conventions, mappingProperties);
 
             await ExecuteSchemaValidateAsync(typeof(TEntity), cancellationToken);
 
-            return await _dbHelper.ExecuteListAsync<TResult>(sql, parameters, r => mapper.Map<TResult>(r, selectorFunc), cancellationToken);
+            using (var reader = await _dbHelper.ExecuteReaderAsync(sql, parameters, cancellationToken))
+            {
+                var list = new List<TResult>();
+                var foundCrossJoinCountColumn = false;
+                var total = 0;
+
+                QueryBuilder.ExtractCrossJoinColumnName(sql, out var crossJoinColumnName);
+
+                while (await reader.ReadAsync(cancellationToken))
+                {
+                    for (var i = 0; i < reader.FieldCount; i++)
+                    {
+                        var name = reader.GetName(i);
+
+                        if (!string.IsNullOrEmpty(crossJoinColumnName) && name.Equals(crossJoinColumnName))
+                        {
+                            total = (int)reader[name];
+                            foundCrossJoinCountColumn = true;
+                            break;
+                        }
+                    }
+
+                    list.Add(selectorFunc(mapper.Map(reader)));
+                }
+
+                if (!foundCrossJoinCountColumn)
+                    total = list.Count;
+
+                return new PagedQueryResult<IEnumerable<TResult>>(list, total);
+            }
         }
 
         /// <summary>
@@ -880,10 +933,9 @@ public async Task<TEntity> FindAsync<TEntity>(CancellationToken cancellationToke
                 options,
                 out var sql,
                 out var parameters,
-                out var navigationProperties,
-                out var getPropertyFromColumnAliasCallback);
+                out var mappingProperties);
 
-            var mapper = new Mapper<TEntity>(Conventions, navigationProperties, getPropertyFromColumnAliasCallback);
+            var mapper = new Mapper<TEntity>(Conventions, mappingProperties);
 
             await ExecuteSchemaValidateAsync(typeof(TEntity), cancellationToken);
 
@@ -909,7 +961,9 @@ public async Task<TEntity> FindAsync<TEntity>(CancellationToken cancellationToke
                         }
                     }
 
-                    dict.Add(mapper.Map<TDictionaryKey>(reader, keySelectFunc), mapper.Map<TElement>(reader, elementSelectorFunc));
+                    var mapped = mapper.Map(reader);
+
+                    dict.Add(keySelectFunc(mapped), elementSelectorFunc(mapped));
                 }
 
                 if (!foundCrossJoinCountColumn)

src/DotNetToolkit.Repository.AdoNet/Internal/DbDataReaderExtensions.cs

@@ -0,0 +1,22 @@
+namespace DotNetToolkit.Repository.AdoNet.Internal
+{
+    using System;
+    using System.Data.Common;
+
+    internal static class DbDataReaderExtensions
+    {
+        public static T GetValue<T>(this DbDataReader reader, int ordinal)
+        {
+            var value = reader.GetValue(ordinal);
+
+            if (value == null || value == DBNull.Value)
+            {
+                return default(T);
+            }
+            else
+            {
+                return (T)value;
+            }
+        }
+    }
+}