Updates

Author: Oren Ferrari

Extensions.Retrieve.cs

@@ -143,7 +143,7 @@ public static QueryResult<Queue<object[]>> Retrieve(this IDbCommand command, str
 		/// <param name="reader">The reader to enumerate.</param>
 		/// <param name="token">Optional cancellation token.</param>
 		/// <param name="useReadAsync">If true (default) will iterate the results using .ReadAsync() otherwise will only Execute the reader asynchronously and then use .Read() to iterate the results but still allowing cancellation.</param>
-		/// <returns>The QueryResult that contains a buffer block of the results and the column mappings.</returns>
+		/// <returns>The QueryResult that contains all the results and the column mappings.</returns>
 		public static async Task<QueryResult<Queue<object[]>>> RetrieveAsync(this DbDataReader reader, CancellationToken? token = null, bool useReadAsync = true)
 		{
 			var t = token ?? CancellationToken.None;
@@ -185,21 +185,11 @@ static async Task<QueryResult<Queue<object[]>>> RetrieveAsyncInternal(DbDataRead
 			var t = token ?? CancellationToken.None;
 			var buffer = new Queue<object[]>();
 
-			if (!readStarted)
-				readStarted = useReadAsync
-					? await reader.ReadAsync(t)
-					: (!t.IsCancellationRequested && reader.Read());
-
 			if (readStarted)
-			{
-				do
-				{
-					buffer.Enqueue(handler(reader));
-				}
-				while (useReadAsync
-					? await reader.ReadAsync(t)
-					: (!t.IsCancellationRequested && reader.Read()));
-			}
+				buffer.Enqueue(handler(reader));
+
+			while (useReadAsync ? await reader.ReadAsync(t) : (!t.IsCancellationRequested && reader.Read()))
+				buffer.Enqueue(handler(reader));
 
 			if (!useReadAsync)
 				t.ThrowIfCancellationRequested();

Open.Database.Extensions.csproj

@@ -11,10 +11,10 @@
     <Description>Useful set of utilities and abstractions for simplifying modern data-access operations and ensuring DI compatibility.</Description>
     <RepositoryUrl>https://github.com/electricessence/Open.Database.Extensions</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
-    <Version>5.12.1</Version>
-    <AssemblyVersion>5.12.0.0</AssemblyVersion>
-    <FileVersion>5.12.0.0</FileVersion>
-    <PackageReleaseNotes>Improved flag handling.</PackageReleaseNotes>
+    <Version>5.12.2</Version>
+    <AssemblyVersion>5.12.2.0</AssemblyVersion>
+    <FileVersion>5.12.2.0</FileVersion>
+    <PackageReleaseNotes></PackageReleaseNotes>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
@@ -23,6 +23,7 @@
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <DocumentationFile>docs\Documentation.xml</DocumentationFile>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>