Recognize enumerable collections.

The code that recognizes whether a property is a collection did not check the actual type of the collection for being an enumerable interface.

Bug: #23

.gitignore

@@ -6,3 +6,4 @@ Thumbs.db
 /*.shfbproj_*
 /*.dotCover
 _ReSharper.*
+/.vs

NHibernate.OData.Test/Domain/Model.hbm.xml

@@ -13,6 +13,10 @@
       <key column="ParentId"/>
       <many-to-many column="RelatedParentId" class="Parent"/>
     </set>
+    <set name="EnumerableRelatedParents">
+      <key column="ParentId"/>
+      <many-to-many column="RelatedParentId" class="Parent"/>
+    </set>
   </class>
   <class name="Child">
     <id name="Id" type="int">

NHibernate.OData.Test/Domain/Parent.cs

@@ -21,6 +21,8 @@ public class Parent : IEntity
 
         public virtual ISet<Parent> RelatedParents { get; set; }
 
+        public virtual IEnumerable<Parent> EnumerableRelatedParents { get; set; }
+
         public override string ToString()
         {
             return Name;

NHibernate.OData.Test/Issues/Issue23Fixture.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using NHibernate.OData.Test.Domain;
+using NHibernate.OData.Test.Support;
+using NUnit.Framework;
+
+namespace NHibernate.OData.Test.Issues
+{
+    [TestFixture]
+    internal class Issue23Fixture : DomainTestFixture
+    {
+        [Test]
+        public void InterfacePropertNotRecognizedAsCollection()
+        {
+            Verify(
+                "EnumerableRelatedParents/any(o: o/Int32 eq 9)",
+                Session.QueryOver<Parent>().Where(x => x.Name == "Parent 10").List()
+            );
+        }
+    }
+}

NHibernate.OData.Test/NHibernate.OData.Test.csproj

@@ -79,6 +79,7 @@
     <Compile Include="Interface\EntityNameInterface.cs" />
     <Compile Include="Interface\ParsedQueryString.cs" />
     <Compile Include="Inverse\Basics.cs" />
+    <Compile Include="Issues\Issue23Fixture.cs" />
     <Compile Include="Issues\Issue13Fixture.cs" />
     <Compile Include="Issues\Issue6Fixture.cs" />
     <Compile Include="Parser\CollectionMethodCalls.cs" />

NHibernate.OData.Test/Support/DomainTestFixture.cs

@@ -80,7 +80,7 @@ private void PopulateDatabase()
                             { "DynamicInt", i },
                             { "DynamicChildRef", previousChild },
                         },
-                        RelatedParents = new HashSet<Parent>(parents),
+                        RelatedParents = new HashSet<Parent>(parents)
                     };
 
                     if (i == 10)
@@ -105,6 +105,8 @@ private void PopulateDatabase()
                     if (i == 10)
                         parent.RelatedParents = new HashSet<Parent>(parents.Where(x => x.Int32 >= 5));
 
+                    parent.EnumerableRelatedParents = parent.RelatedParents;
+
                     session.Save(parent);
                     parents.Add(parent);
 

NHibernate.OData/TypeUtil.cs

@@ -12,11 +12,19 @@ public static System.Type TryGetCollectionItemType(System.Type collectionType)
             if (collectionType == null)
                 return null;
 
-            System.Type enumerableType = collectionType.GetInterfaces().FirstOrDefault(x => x.IsGenericType && x.GetGenericTypeDefinition() == typeof(IEnumerable<>));
+            if (collectionType.IsInterface && IsCollectionType(collectionType))
+                return collectionType.GetGenericArguments().Single();
+
+            System.Type enumerableType = collectionType.GetInterfaces().FirstOrDefault(IsCollectionType);
             if (enumerableType == null)
                 return null;
 
             return enumerableType.GetGenericArguments().Single();
         }
+
+        private static bool IsCollectionType(System.Type type)
+        {
+            return type.IsGenericType && type.GetGenericTypeDefinition() == typeof(IEnumerable<>);
+        }
     }
 }