Merge branch 'release/v0.3.1'

verdie-g · Jan 8, 2018 · 5facb19 · 5facb19
2 parents f1ea94f + fc20f1d
commit 5facb19
Show file tree

Hide file tree

Showing 3 changed files with 61 additions and 31 deletions.
diff --git a/README.md b/README.md
@@ -52,8 +52,10 @@ Dictionary<TKey, List<TValue>>       ToLookup<TKey, TValue>()
 Task<Dictionary<TKey, List<TValue>>> ToLookupAsync<TKey, TValue>()
 HashSet<T>                           ToSet<T>()
 Task<HashSet<T>>                     ToSetAsync<T>()
-List<T>                              Column<T>(string columnName = null)
-Task<List<T>>                        ColumnAsync<T>(string columnName = null)
+List<T>                              Column<T>()
+List<T>                              Column<T>(string columnName)
+Task<List<T>>                        ColumnAsync<T>()
+Task<List<T>>                        ColumnAsync<T>(string columnName)
 T                                    First<T>()
 Task<T>                              FirstAsync<T>()
 T                                    FirstOrDefault<T>()

diff --git a/StoredProcedureEFCore.Tests.SqlServer/StoredProcedureEFCore.Tests.SqlServer.csproj b/StoredProcedureEFCore.Tests.SqlServer/StoredProcedureEFCore.Tests.SqlServer.csproj
@@ -5,7 +5,7 @@
     <TargetFramework>netcoreapp1.1</TargetFramework>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+  <PropertyGroup Condition="'$(Platform)'=='AnyCPU'">
     <LangVersion>7.1</LangVersion>
   </PropertyGroup>
 

diff --git a/StoredProcedureEFCore/DbDataReaderExtension.cs b/StoredProcedureEFCore/DbDataReaderExtension.cs
@@ -4,7 +4,6 @@
 using System.Diagnostics;
 using System.Reflection;
 using System.Runtime.CompilerServices;
-using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 
 namespace StoredProcedureEFCore
@@ -48,43 +47,51 @@ public static class DbDataReaderExtension
     }
 
     /// <summary>
-    /// Map the first or the specified column to a list
+    /// Map the first column to a list
     /// </summary>
     /// <typeparam name="T">Model</typeparam>
     /// <param name="reader"></param>
-    /// <param name="columnName">Name of the column to read</param>
     /// <returns></returns>
-    public static List<T> Column<T>(this DbDataReader reader, string columnName = null) where T : IComparable
+    public static List<T> Column<T>(this DbDataReader reader) where T : IComparable
     {
-      int ord = columnName == null ? 0 : reader.GetOrdinal(columnName);
+      return Column<T>(reader, 0);
+    }
 
-      var res = new List<T>();
-      while (reader.Read())
-      {
-        T value = reader.IsDBNull(ord) ? default(T) : (T)reader.GetValue(ord);
-        res.Add(value);
-      }
-      return res;
+    /// <summary>
+    /// Map the specified column to a list
+    /// </summary>
+    /// <typeparam name="T">Model</typeparam>
+    /// <param name="reader"></param>
+    /// <param name="columnName">Name of the column to read. Use first column if null</param>
+    /// <returns></returns>
+    public static List<T> Column<T>(this DbDataReader reader, string columnName) where T : IComparable
+    {
+      int ordinal = columnName is null ? 0 : reader.GetOrdinal(columnName);
+      return Column<T>(reader, ordinal);
     }
 
     /// <summary>
-    /// Map the first or the specified column to a list
+    /// Map the first column to a list
     /// </summary>
     /// <typeparam name="T">Model</typeparam>
     /// <param name="reader"></param>
-    /// <param name="columnName">Name of the column to read</param>
     /// <returns></returns>
-    public static async Task<List<T>> ColumnAsync<T>(this DbDataReader reader, string columnName = null) where T : IComparable
+    public static Task<List<T>> ColumnAsync<T>(this DbDataReader reader) where T : IComparable
     {
-      int ord = columnName == null ? 0 : reader.GetOrdinal(columnName);
+      return ColumnAsync<T>(reader, 0);
+    }
 
-      var res = new List<T>();
-      while (await reader.ReadAsync())
-      {
-        T value = await reader.IsDBNullAsync(ord) ? default(T) : (T)reader.GetValue(ord);
-        res.Add(value);
-      }
-      return res;
+    /// <summary>
+    /// Map the specified column to a list
+    /// </summary>
+    /// <typeparam name="T">Model</typeparam>
+    /// <param name="reader"></param>
+    /// <param name="columnName">Name of the column to read. Use first column if null</param>
+    /// <returns></returns>
+    public static Task<List<T>> ColumnAsync<T>(this DbDataReader reader, string columnName) where T : IComparable
+    {
+      int ordinal = columnName is null ? 0 : reader.GetOrdinal(columnName);
+      return ColumnAsync<T>(reader, ordinal);
     }
 
     /// <summary>
@@ -313,6 +320,28 @@ public static async Task<HashSet<T>> ToSetAsync<T>(this DbDataReader reader) whe
       return await FirstAsync<T>(reader, true, true);
     }
 
+    private static List<T> Column<T>(DbDataReader reader, int ordinal) where T : IComparable
+    {
+      var res = new List<T>();
+      while (reader.Read())
+      {
+        T value = reader.IsDBNull(ordinal) ? default(T) : (T)reader.GetValue(ordinal);
+        res.Add(value);
+      }
+      return res;
+    }
+
+    private static async Task<List<T>> ColumnAsync<T>(DbDataReader reader, int ordinal) where T : IComparable
+    {
+      var res = new List<T>();
+      while (await reader.ReadAsync())
+      {
+        T value = await reader.IsDBNullAsync(ordinal) ? default(T) : (T)reader.GetValue(ordinal);
+        res.Add(value);
+      }
+      return res;
+    }
+
     private static T First<T>(DbDataReader reader, bool orDefault, bool throwIfNotSingle) where T : class, new()
     {
       if (reader.Read())
@@ -334,12 +363,12 @@ public static async Task<HashSet<T>> ToSetAsync<T>(this DbDataReader reader) whe
 
     private static async Task<T> FirstAsync<T>(DbDataReader reader, bool orDefault, bool throwIfNotSingle) where T : class, new()
     {
-      if (reader.Read())
+      if (await reader.ReadAsync())
       {
         PropertyInfo[] props = GetDataReaderColumns<T>(reader);
         T row = await MapNextRowAsync<T>(reader, props);
 
-        if (throwIfNotSingle && reader.Read())
+        if (throwIfNotSingle && await reader.ReadAsync())
           throw new InvalidOperationException("Sequence contains more than one element");
 
         return row;
@@ -403,9 +432,8 @@ public static async Task<HashSet<T>> ToSetAsync<T>(this DbDataReader reader) whe
       Type modelType = typeof(T);
       for (int i = 0; i < reader.FieldCount; i++)
       {
-        string name = reader.GetName(i);
-        string nameNoUnderscore = Regex.Replace(name, "[_-]", "");
-        res[i] = modelType.GetProperty(nameNoUnderscore, BindingFlags.IgnoreCase | BindingFlags.Public | BindingFlags.Instance);
+        string name = reader.GetName(i).Replace("_", "");
+        res[i] = modelType.GetProperty(name, BindingFlags.IgnoreCase | BindingFlags.Public | BindingFlags.Instance);
       }
       return res;
     }