Merge pull request #35 from Lempireqc/master

save

Author: JonathanMagnan

EntityFrameworkExtras.Shared/StoredProcedureParserHelper.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Data;
+using System.Linq;
 using System.Reflection;
 
 #if EF4
@@ -42,18 +43,22 @@ public string GetUserDefinedTableType(PropertyInfo propertyInfo)
 
         public Type GetCollectionType(Type type)
         {
-            if (type.IsGenericType)
+	        Type returnType = null;
+	        if (type.IsGenericType)
             {
-                foreach (Type interfaceType in type.GetInterfaces())
-                {
-                    if (interfaceType.GetGenericTypeDefinition() == typeof (IList<>))
-                    {
-                        return interfaceType.GetGenericArguments()[0];
-                    }
+	            if (type.IsInterface && type.GetGenericTypeDefinition() == typeof(IEnumerable<>))
+	            {
+		            returnType =  type.GetGenericArguments().FirstOrDefault();
                 }
+	            else
+	            {
+		            returnType = type.GetInterfaces()
+                        .Where(x => x.IsGenericType)
+                        .FirstOrDefault(x => x.GetGenericTypeDefinition() == typeof(IEnumerable<>))?.GetGenericArguments().FirstOrDefault();
+                } 
             }
 
-            return null;
+            return returnType;
 
         }
 

EntityFrameworkExtras.Tests.Shared/Integration/StoredProcedures/UserDefinedTableExplicitlySetColumnNameStoredProcedure.cs

@@ -15,6 +15,13 @@ namespace EntityFrameworkExtras.Tests.Integration.StoredProcedures
     public class UserDefinedTableExplicitlySetColumnNameStoredProcedure
     {
         [StoredProcedureParameter(SqlDbType.Udt)]
-        public List<ExplicitySetColumnNamesUserDefinedTable> UserDefinedTableParameter { get; set; }
+        public IEnumerable<ExplicitySetColumnNamesUserDefinedTable> UserDefinedTableParameter { get; set; }
+    }
+
+    [StoredProcedure("UserDefinedTableStoredProcedure")]
+    public class UserDefinedTableExplicitlySetColumnNameStoredProcedure2
+    {
+	    [StoredProcedureParameter(SqlDbType.Udt)]
+	    public List<ExplicitySetColumnNamesUserDefinedTable> UserDefinedTableParameter { get; set; }
     }
 }

EntityFrameworkExtras.Tests.Shared/Integration/UserDefinedTableTypeColumnTests.cs

@@ -78,5 +78,29 @@ public void Execute_ExplicitySetColumnName_CorrectValueReturned()
             Assert.AreEqual(GetBytes("michael rodda"), result.ParameterBinary);
 
         }
+
+
+        [Test]
+        public void Execute_ExplicitySetColumnName_CorrectValueReturned2()
+        {
+	        var proc = new UserDefinedTableExplicitlySetColumnNameStoredProcedure2();
+
+	        proc.UserDefinedTableParameter = new List<ExplicitySetColumnNamesUserDefinedTable>()
+	        {
+		        new ExplicitySetColumnNamesUserDefinedTable()
+		        {
+			        NvarChar = "Theses Columns Names were Explicity Set",
+			        BigInt = 1000,
+			        Binary = GetBytes("michael rodda")
+		        }
+	        };
+
+	        var result = ExecuteStoredProcedureSingle<AllTypesStoredProcedureReturn>(proc);
+
+	        Assert.AreEqual("Theses Columns Names were Explicity Set", result.ParameterNvarChar);
+	        Assert.AreEqual(1000, result.ParameterBigInt);
+	        Assert.AreEqual(GetBytes("michael rodda"), result.ParameterBinary);
+
+        }
     }
 }