More overloads for using ValueTuples.

Author: electricessence

Documentation.xml

@@ -126,59 +126,59 @@ public Task<List<T>> TakeAsync<T>(Func<IDataRecord, T> transform, int count)
 		/// <returns>The task that completes when the iteration is done or the predicate evaluates false.</returns>
 		public abstract Task IterateReaderAsyncWhile(Func<IDataRecord, Task<bool>> predicate);
 
-        /// <summary>
-        /// Asynchronously iterates all records within the first result set using an IDataReader and returns the results.
-        /// </summary>
-        /// <returns>The QueryResult that contains all the results and the column mappings.</returns>
-        public abstract Task<QueryResult<Queue<object[]>>> RetrieveAsync();
-
-        /// <summary>
-        /// Asynchronously iterates all records within the current result set using an IDataReader and returns the desired results.
-        /// </summary>
-        /// <param name="ordinals">The ordinals to request from the reader for each record.</param>
-        /// <returns>The QueryResult that contains all the results and the column mappings.</returns>
-        public abstract Task<QueryResult<Queue<object[]>>> RetrieveAsync(IEnumerable<int> ordinals);
-
-        /// <summary>
-        /// Asynchronously iterates all records within the current result set using an IDataReader and returns the desired results.
-        /// </summary>
-        /// <param name="n">The first ordinal to include in the request to the reader for each record.</param>
-        /// <param name="others">The remaining ordinals to request from the reader for each record.</param>
-        /// <returns>The QueryResult that contains all the results and the column mappings.</returns>
-        public Task<QueryResult<Queue<object[]>>> RetrieveAsync(int n, params int[] others)
-            => RetrieveAsync(new int[1] { n }.Concat(others));
-
-        /// <summary>
-        /// Iterates all records within the first result set using an IDataReader and returns the desired results as a list of Dictionaries containing only the specified column values.
-        /// </summary>
-        /// <param name="columnNames">The column names to select.</param>
-        /// <param name="normalizeColumnOrder">Orders the results arrays by ordinal.</param>
-        /// <returns>The QueryResult that contains all the results and the column mappings.</returns>
-        public abstract Task<QueryResult<Queue<object[]>>> RetrieveAsync(IEnumerable<string> columnNames, bool normalizeColumnOrder = false);
-
-        /// <summary>
-        /// Iterates all records within the current result set using an IDataReader and returns the desired results.
-        /// </summary>
-        /// <param name="c">The first column name to include in the request to the reader for each record.</param>
-        /// <param name="others">The remaining column names to request from the reader for each record.</param>
-        /// <returns>The QueryResult that contains all the results and the column mappings.</returns>
-        public Task<QueryResult<Queue<object[]>>> RetrieveAsync(string c, params string[] others)
-            => RetrieveAsync(new string[1] { c }.Concat(others));
-
-        /// <summary>
-        /// Posts all transformed records to the provided target block.
-        /// If .Complete is called on the target block, then the iteration stops.
-        /// </summary>
-        /// <typeparam name="T">The return type of the transform function.</typeparam>
-        /// <param name="transform">The transform function to process each IDataRecord.</param>
-        /// <param name="target">The target block to receive the records.</param>
-        /// <returns>A task that is complete once there are no more results.</returns>
-        public Task ToTargetBlockAsync<T>(ITargetBlock<T> target, Func<IDataRecord, T> transform)
+		/// <summary>
+		/// Asynchronously iterates all records within the first result set using an IDataReader and returns the results.
+		/// </summary>
+		/// <returns>The QueryResult that contains all the results and the column mappings.</returns>
+		public abstract Task<QueryResult<Queue<object[]>>> RetrieveAsync();
+
+		/// <summary>
+		/// Asynchronously iterates all records within the current result set using an IDataReader and returns the desired results.
+		/// </summary>
+		/// <param name="ordinals">The ordinals to request from the reader for each record.</param>
+		/// <returns>The QueryResult that contains all the results and the column mappings.</returns>
+		public abstract Task<QueryResult<Queue<object[]>>> RetrieveAsync(IEnumerable<int> ordinals);
+
+		/// <summary>
+		/// Asynchronously iterates all records within the current result set using an IDataReader and returns the desired results.
+		/// </summary>
+		/// <param name="n">The first ordinal to include in the request to the reader for each record.</param>
+		/// <param name="others">The remaining ordinals to request from the reader for each record.</param>
+		/// <returns>The QueryResult that contains all the results and the column mappings.</returns>
+		public Task<QueryResult<Queue<object[]>>> RetrieveAsync(int n, params int[] others)
+			=> RetrieveAsync(new int[1] { n }.Concat(others));
+
+		/// <summary>
+		/// Iterates all records within the first result set using an IDataReader and returns the desired results as a list of Dictionaries containing only the specified column values.
+		/// </summary>
+		/// <param name="columnNames">The column names to select.</param>
+		/// <param name="normalizeColumnOrder">Orders the results arrays by ordinal.</param>
+		/// <returns>The QueryResult that contains all the results and the column mappings.</returns>
+		public abstract Task<QueryResult<Queue<object[]>>> RetrieveAsync(IEnumerable<string> columnNames, bool normalizeColumnOrder = false);
+
+		/// <summary>
+		/// Iterates all records within the current result set using an IDataReader and returns the desired results.
+		/// </summary>
+		/// <param name="c">The first column name to include in the request to the reader for each record.</param>
+		/// <param name="others">The remaining column names to request from the reader for each record.</param>
+		/// <returns>The QueryResult that contains all the results and the column mappings.</returns>
+		public Task<QueryResult<Queue<object[]>>> RetrieveAsync(string c, params string[] others)
+			=> RetrieveAsync(new string[1] { c }.Concat(others));
+
+		/// <summary>
+		/// Posts all transformed records to the provided target block.
+		/// If .Complete is called on the target block, then the iteration stops.
+		/// </summary>
+		/// <typeparam name="T">The return type of the transform function.</typeparam>
+		/// <param name="transform">The transform function to process each IDataRecord.</param>
+		/// <param name="target">The target block to receive the records.</param>
+		/// <returns>A task that is complete once there are no more results.</returns>
+		public Task ToTargetBlockAsync<T>(ITargetBlock<T> target, Func<IDataRecord, T> transform)
 		{
 			Task<bool> lastSend = null;
 			return IterateReaderAsyncWhile(async r =>
 			{
-				if (lastSend!=null && !await lastSend) return false;
+				if (lastSend != null && !await lastSend) return false;
 				lastSend = target.SendAsync(transform(r));
 				return true;
 			});
@@ -205,33 +205,73 @@ public ISourceBlock<T> AsSourceBlockAsync<T>(Func<IDataRecord, T> transform)
 		/// <typeparam name="T">The model type to map the values to (using reflection).</typeparam>
 		/// <param name="fieldMappingOverrides">An override map of field names to column names where the keys are the property names, and values are the column names.</param>
 		/// <returns>A transform block that is recieving the results.</returns>
-		public abstract ISourceBlock<T> AsSourceBlockAsync<T>(IEnumerable<KeyValuePair<string, string>> fieldMappingOverrides)
-		   where T : new();
+		public abstract ISourceBlock<T> AsSourceBlockAsync<T>(IEnumerable<(string Field, string Column)> fieldMappingOverrides)
+			where T : new();
+
+		/// <summary>
+		/// Returns a source block as the source of records.
+		/// </summary>
+		/// <typeparam name="T">The model type to map the values to (using reflection).</typeparam>
+		/// <param name="fieldMappingOverrides">An override map of field names to column names where the keys are the property names, and values are the column names.</param>
+		/// <returns>A transform block that is recieving the results.</returns>
+		public ISourceBlock<T> AsSourceBlockAsync<T>(IEnumerable<KeyValuePair<string, string>> fieldMappingOverrides)
+		   where T : new()
+			=> AsSourceBlockAsync<T>(fieldMappingOverrides?.Select(kvp => (kvp.Key, kvp.Value)));
+
+		/// <summary>
+		/// Returns a source block as the source of records.
+		/// </summary>
+		/// <typeparam name="T">The model type to map the values to (using reflection).</typeparam>
+		/// <param name="fieldMappingOverrides">An override map of field names to column names where the keys are the property names, and values are the column names.</param>
+		/// <returns>A transform block that is recieving the results.</returns>
+		public ISourceBlock<T> AsSourceBlockAsync<T>(params (string Field, string Column)[] fieldMappingOverrides)
+		where T : new()
+			=> AsSourceBlockAsync<T>((IEnumerable<(string Field, string Column)>)fieldMappingOverrides);
+
 
 		/// <summary>
 		/// Asynchronously returns all records via a transform function.
 		/// </summary>
 		/// <param name="transform">The desired column names.</param>
 		/// <returns>A task containing the list of results.</returns>
 		public async Task<List<T>> ToListAsync<T>(Func<IDataRecord, T> transform)
-        {
-            var results = new List<T>();
-            await IterateReaderAsync(record => results.Add(transform(record)));
-            return results;
-        }
-
-        /// <summary>
-        /// Asynchronously returns all records and iteratively attempts to map the fields to type T.
-        /// </summary>
+		{
+			var results = new List<T>();
+			await IterateReaderAsync(record => results.Add(transform(record)));
+			return results;
+		}
+
+		/// <summary>
+		/// Asynchronously returns all records and iteratively attempts to map the fields to type T.
+		/// </summary>
 		/// <typeparam name="T">The model type to map the values to (using reflection).</typeparam>
 		/// <param name="fieldMappingOverrides">An override map of field names to column names where the keys are the property names, and values are the column names.</param>
-        /// <returns>A task containing the list of results.</returns>
-        public async Task<IEnumerable<T>> ResultsAsync<T>(IEnumerable<KeyValuePair<string, string>> fieldMappingOverrides = null) where T : new()
-        {
-            var x = new Transformer<T>(fieldMappingOverrides);
-            return x.AsDequeueingEnumerable(await RetrieveAsync(x.ColumnNames));
-        }
+		/// <returns>A task containing the list of results.</returns>
+		public async Task<IEnumerable<T>> ResultsAsync<T>(IEnumerable<(string Field, string Column)> fieldMappingOverrides) where T : new()
+		{
+			var x = new Transformer<T>(fieldMappingOverrides);
+			return x.AsDequeueingEnumerable(await RetrieveAsync(x.ColumnNames));
+		}
 
+		/// <summary>
+		/// Asynchronously returns all records and iteratively attempts to map the fields to type T.
+		/// </summary>
+		/// <typeparam name="T">The model type to map the values to (using reflection).</typeparam>
+		/// <param name="fieldMappingOverrides">An override map of field names to column names where the keys are the property names, and values are the column names.</param>
+		/// <returns>A task containing the list of results.</returns>
+		public Task<IEnumerable<T>> ResultsAsync<T>(IEnumerable<KeyValuePair<string, string>> fieldMappingOverrides) where T : new()
+			=> ResultsAsync<T>(fieldMappingOverrides?.Select(kvp => (kvp.Key, kvp.Value)));
 
-    }
+		/// <summary>
+		/// Asynchronously returns all records and iteratively attempts to map the fields to type T.
+		/// </summary>
+		/// <typeparam name="T">The model type to map the values to (using reflection).</typeparam>
+		/// <param name="fieldMappingOverrides">An override map of field names to column names where the keys are the property names, and values are the column names.</param>
+		/// <returns>A task containing the list of results.</returns>
+		public async Task<IEnumerable<T>> ResultsAsync<T>(params (string Field, string Column)[] fieldMappingOverrides) where T : new()
+		{
+			var x = new Transformer<T>(fieldMappingOverrides);
+			return x.AsDequeueingEnumerable(await RetrieveAsync(x.ColumnNames));
+		}
+	}
 }

ExpressiveAsyncCommandBase.cs

@@ -444,7 +444,29 @@ public QueryResult<Queue<object[]>> Retrieve(string c, params string[] others)
 		/// <typeparam name="T">The model type to map the values to (using reflection).</typeparam>
 		/// <param name="fieldMappingOverrides">An optional override map of field names to column names where the keys are the property names, and values are the column names.</param>
 		/// <returns>The enumerable to pull the transformed results from.</returns>
-		public IEnumerable<T> Results<T>(IEnumerable<KeyValuePair<string, string>> fieldMappingOverrides = null)
+		public IEnumerable<T> Results<T>(IEnumerable<KeyValuePair<string, string>> fieldMappingOverrides)
+			where T : new()
+			=> Execute(command => command.Results<T>(fieldMappingOverrides));
+
+		/// <summary>
+		/// Iterates each record and attempts to map the fields to type T.
+		/// Data is temporarily stored (buffered in entirety) in a queue of dictionaries before applying the transform for each iteration.
+		/// </summary>
+		/// <typeparam name="T">The model type to map the values to (using reflection).</typeparam>
+		/// <param name="fieldMappingOverrides">An optional override map of field names to column names where the keys are the property names, and values are the column names.</param>
+		/// <returns>The enumerable to pull the transformed results from.</returns>
+		public IEnumerable<T> Results<T>(IEnumerable<(string Field, string Column)> fieldMappingOverrides)
+			where T : new()
+			=> Execute(command => command.Results<T>(fieldMappingOverrides));
+
+		/// <summary>
+		/// Iterates each record and attempts to map the fields to type T.
+		/// Data is temporarily stored (buffered in entirety) in a queue of dictionaries before applying the transform for each iteration.
+		/// </summary>
+		/// <typeparam name="T">The model type to map the values to (using reflection).</typeparam>
+		/// <param name="fieldMappingOverrides">An optional override map of field names to column names where the keys are the property names, and values are the column names.</param>
+		/// <returns>The enumerable to pull the transformed results from.</returns>
+		public IEnumerable<T> Results<T>(params (string Field, string Column)[] fieldMappingOverrides)
 			where T : new()
 			=> Execute(command => command.Results<T>(fieldMappingOverrides));
 
@@ -488,7 +510,7 @@ void i()
 		/// If set to true, the command runs synchronusly and all data is acquired before the method returns.
 		/// If set to false (default) the data is recieved asynchronously (data will be subsequently posted) and the source block (transform) can be completed early.</param>
 		/// <returns>A transform block that is recieving the results.</returns>
-		public ISourceBlock<T> AsSourceBlock<T>(IEnumerable<KeyValuePair<string, string>> fieldMappingOverrides, bool synchronousExecution = false)
+		public ISourceBlock<T> AsSourceBlock<T>(IEnumerable<(string Field, string Column)> fieldMappingOverrides, bool synchronousExecution = false)
 		   where T : new()
 		{
 			var x = new Transformer<T>(fieldMappingOverrides);
@@ -515,6 +537,28 @@ void i() => ExecuteReader(reader =>
 			return q;
 		}
 
+		/// <summary>
+		/// Provides a transform block as the source of records.
+		/// </summary>
+		/// <typeparam name="T">The model type to map the values to (using reflection).</typeparam>
+		/// <param name="fieldMappingOverrides">An override map of field names to column names where the keys are the property names, and values are the column names.</param>
+		/// <param name="synchronousExecution">By default the command is deferred.
+		/// If set to true, the command runs synchronusly and all data is acquired before the method returns.
+		/// If set to false (default) the data is recieved asynchronously (data will be subsequently posted) and the source block (transform) can be completed early.</param>
+		/// <returns>A transform block that is recieving the results.</returns>
+		public ISourceBlock<T> AsSourceBlock<T>(IEnumerable<KeyValuePair<string, string>> fieldMappingOverrides, bool synchronousExecution = false)
+		   where T : new()
+			=> AsSourceBlock<T>(fieldMappingOverrides?.Select(kvp => (kvp.Key, kvp.Value)), synchronousExecution);
+
+		/// <summary>
+		/// Provides a transform block as the source of records.
+		/// </summary>
+		/// <typeparam name="T">The model type to map the values to (using reflection).</typeparam>
+		/// <param name="fieldMappingOverrides">An override map of field names to column names where the keys are the property names, and values are the column names.</param>
+		/// <returns>A transform block that is recieving the results.</returns>
+		public ISourceBlock<T> AsSourceBlock<T>(params (string Field, string Column)[] fieldMappingOverrides)
+			where T : new()
+			=> AsSourceBlock<T>((IEnumerable<(string Field, string Column)>)fieldMappingOverrides);
 
 	}
 }