Implement IQueryable<T> support for PersistentGenericList

Author: hazzik

src/NHibernate.Test/NHSpecificTest/NH2319/Fixture.cs

@@ -119,6 +119,7 @@ public void TestFilter()
 
 		protected override void Configure(Configuration configuration)
 		{
+			configuration.SetProperty("show_sql", "true");
 			configuration.SetProperty("generate_statistics", "true");
 		}
 
@@ -261,4 +262,50 @@ protected override HbmMapping GetMappings()
 			return mapper.CompileMappingForAllExplicitlyAddedEntities();
 		}
 	}
+
+	[TestFixture]
+	public class ListFixture : FixtureBase
+	{
+		protected override HbmMapping GetMappings()
+		{
+			var mapper = new ModelMapper();
+			mapper.Class<Parent>(rc =>
+			{
+				rc.Id(x => x.Id, m => m.Generator(Generators.GuidComb));
+				rc.Property(x => x.Name);
+				rc.List(
+					x => x.Children,
+					list =>
+					{
+						list.Cascade(Mapping.ByCode.Cascade.All | Mapping.ByCode.Cascade.DeleteOrphans);
+						list.Index(i => i.Column("i"));
+					},
+					rel => rel.OneToMany());
+			});
+
+			mapper.Class<Child>(rc =>
+			{
+				rc.Id(x => x.Id, m => m.Generator(Generators.GuidComb));
+				rc.Property(x => x.Name);
+				rc.ManyToOne(x => x.Parent);
+				rc.List(
+					c => c.GrandChildren,
+					list =>
+					{
+						list.Cascade(Mapping.ByCode.Cascade.All | Mapping.ByCode.Cascade.DeleteOrphans);
+						list.Index(i => i.Column("i"));
+					},
+					rel => rel.OneToMany());
+			});
+
+			mapper.Class<GrandChild>(rc =>
+			{
+				rc.Id(x => x.Id, m => m.Generator(Generators.GuidComb));
+				rc.Property(x => x.Name);
+				rc.ManyToOne(x => x.Child, x => x.Column("child_id"));
+			});
+
+			return mapper.CompileMappingForAllExplicitlyAddedEntities();
+		}
+	}
 }

src/NHibernate/Collection/Generic/PersistentGenericList.cs

@@ -3,8 +3,11 @@
 using System.Collections.Generic;
 using System.Data.Common;
 using System.Diagnostics;
+using System.Linq;
+using System.Linq.Expressions;
 using NHibernate.DebugHelpers;
 using NHibernate.Engine;
+using NHibernate.Linq;
 using NHibernate.Loader;
 using NHibernate.Persister.Collection;
 using NHibernate.Type;
@@ -19,7 +22,7 @@ namespace NHibernate.Collection.Generic
 	/// <remarks>The underlying collection used is a <see cref="List{T}"/></remarks>
 	[Serializable]
 	[DebuggerTypeProxy(typeof (CollectionProxy<>))]
-	public class PersistentGenericList<T> : AbstractPersistentCollection, IList<T>, IList
+	public class PersistentGenericList<T> : AbstractPersistentCollection, IList<T>, IList, IQueryable<T>
 	{
 		protected IList<T> WrappedList;
 
@@ -497,7 +500,6 @@ IEnumerator IEnumerable.GetEnumerator()
 
 		#endregion
 
-
 		#region IEnumerable<T> Members
 
 		IEnumerator<T> IEnumerable<T>.GetEnumerator()
@@ -507,7 +509,20 @@ IEnumerator<T> IEnumerable<T>.GetEnumerator()
 		}
 
 		#endregion
+		
+		#region IQueryable<T> Members
+
+		IQueryable<T> _queryable;
+
+		Expression IQueryable.Expression => InnerQueryable.Expression;
+
+		System.Type IQueryable.ElementType => InnerQueryable.ElementType;
 
+		IQueryProvider IQueryable.Provider => InnerQueryable.Provider;
+
+		IQueryable<T> InnerQueryable => _queryable ?? (_queryable = new NhQueryable<T>(Session, this));
+
+		#endregion
 
 		#region DelayedOperations