fixes the generation of Collection-Filters on a JoinedSubclass

Author: mika

src/NHibernate.DomainModel/Async/CustomPersister.cs

@@ -10,6 +10,7 @@
 
 using System;
 using System.Collections;
+using System.Collections.Generic;
 using NHibernate.Cache;
 using NHibernate.Cache.Entry;
 using NHibernate.Engine;

src/NHibernate.DomainModel/CustomPersister.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections;
+using System.Collections.Generic;
 using NHibernate.Cache;
 using NHibernate.Cache.Entry;
 using NHibernate.Engine;
@@ -519,6 +520,14 @@ public IComparer VersionComparator
 
 		public IEntityTuplizer EntityTuplizer => null;
 
+
+		public FilterHelper FilterHelper => throw new NotSupportedException();
+		
+		public string FilterFragment(string alias, IDictionary<string, IFilter> enabledFilters)
+		{
+			throw new NotSupportedException();
+		}
+
 		#endregion
 	}
 }

src/NHibernate/Async/Persister/Entity/IEntityPersister.cs

@@ -26,7 +26,7 @@ namespace NHibernate.Persister.Entity
 	using System.Threading.Tasks;
 	using System.Threading;
 
-	public partial interface IEntityPersister : IOptimisticCacheSource
+	public partial interface IEntityPersister : IFilterable, IOptimisticCacheSource
 	{
 
 		#region stuff that is persister-centric and/or EntityInfo-centric

src/NHibernate/Persister/Collection/AbstractCollectionPersister.cs

@@ -131,7 +131,7 @@ public abstract partial class AbstractCollectionPersister : ICollectionMetadata,
 		private readonly ICacheEntryStructure cacheEntryStructure;
 
 		// dynamic filters for the collection
-		private readonly FilterHelper filterHelper;
+		public FilterHelper FilterHelper { get; }
 
 		#region Dynamic filters specifically for many-to-many inside the collection
 
@@ -513,7 +513,7 @@ public AbstractCollectionPersister(Mapping.Collection collection, ICacheConcurre
 			}
 
 			// Handle any filters applied to this collection
-			filterHelper = new FilterHelper(collection.FilterMap, dialect, factory.SQLFunctionRegistry);
+			FilterHelper = new FilterHelper(collection.FilterMap, dialect, factory.SQLFunctionRegistry);
 
 			// Handle any filters applied to this collection for many-to-many
 			manyToManyFilterHelper = new FilterHelper(collection.ManyToManyFilterMap, dialect, factory.SQLFunctionRegistry);
@@ -1471,10 +1471,41 @@ protected virtual string FilterFragment(string alias)
 			return HasWhere ? " and " + GetSQLWhereString(alias) : "";
 		}
 
+		/// <summary>
+		/// Get the where clause filter, given a query alias and considering enabled session filters.
+		///
+		/// When an <see cref="IEntityPersister"/> is set, the filter generated by the persister is returned. This ensures
+		/// that a proper filter is also generated for subclass hierarchy relations.
+		/// </summary>
+		/// <param name="alias"></param>
+		/// <param name="enabledFilters"></param>
+		/// <returns></returns>
 		public virtual string FilterFragment(string alias, IDictionary<string, IFilter> enabledFilters)
 		{
+			if(!enabledFilters.Any())
+			{
+				// no filters enabled
+				// but a potential where condition needs to be handled properly
+				return FilterFragment(alias);
+			}
+			
+			if(!FilterHelper.IsAffectedBy(enabledFilters))
+			{
+				// the collection filters don't match with the enabled filters
+				// but a potential where condition needs to be handled properly
+				return FilterFragment(alias);
+			}
+			
+			if(ElementPersister != null && 
+			   ElementPersister.FilterHelper.IsAffectedBy(enabledFilters))
+			{
+				// forward filter generation to persister when it is affected by the filter
+				return ElementPersister.FilterFragment(alias, enabledFilters);
+			}
+			
+			// default handling
 			StringBuilder sessionFilterFragment = new StringBuilder();
-			filterHelper.Render(sessionFilterFragment, alias, enabledFilters);
+			FilterHelper.Render(sessionFilterFragment, alias, enabledFilters);
 
 			return sessionFilterFragment.Append(FilterFragment(alias)).ToString();
 		}
@@ -1494,7 +1525,7 @@ public override string ToString()
 		public bool IsAffectedByEnabledFilters(ISessionImplementor session)
 		{
 			return
-				filterHelper.IsAffectedBy(session.EnabledFilters)
+				FilterHelper.IsAffectedBy(session.EnabledFilters)
 				|| (IsManyToMany && manyToManyFilterHelper.IsAffectedBy(session.EnabledFilters));
 		}
 

src/NHibernate/Persister/Entity/AbstractEntityPersister.cs

@@ -199,7 +199,7 @@ public virtual void BindValues(DbCommand ps)
 
 		#region Dynamic filters attached to the class-level
 
-		private readonly FilterHelper filterHelper;
+		public FilterHelper FilterHelper { get; }
 
 		#endregion
 
@@ -516,7 +516,7 @@ protected AbstractEntityPersister(PersistentClass persistentClass, ICacheConcurr
 			#endregion
 
 			// Handle any filters applied to the class level
-			filterHelper = new FilterHelper(persistentClass.FilterMap, factory.Dialect, factory.SQLFunctionRegistry);
+			FilterHelper = new FilterHelper(persistentClass.FilterMap, factory.Dialect, factory.SQLFunctionRegistry);
 
 			temporaryIdTableName = persistentClass.TemporaryIdTableName;
 			temporaryIdTableDDL = persistentClass.TemporaryIdTableDDL;
@@ -3666,11 +3666,11 @@ protected void LogStaticSQL()
 		public virtual string FilterFragment(string alias, IDictionary<string, IFilter> enabledFilters)
 		{
 			var filterFragment = FilterFragment(alias);
-			if (!filterHelper.IsAffectedBy(enabledFilters))
+			if (!FilterHelper.IsAffectedBy(enabledFilters))
 				return filterFragment;
 
 			var sessionFilterFragment = new StringBuilder();
-			filterHelper.Render(sessionFilterFragment, GenerateFilterConditionAlias(alias), GetColumnsToTableAliasMap(alias), enabledFilters);
+			FilterHelper.Render(sessionFilterFragment, GenerateFilterConditionAlias(alias), GetColumnsToTableAliasMap(alias), enabledFilters);
 			return sessionFilterFragment.Append(filterFragment).ToString();
 		}
 

src/NHibernate/Persister/Entity/IEntityPersister.cs

@@ -26,7 +26,7 @@ public struct EntityPersister
 	/// Implementors must be threadsafe (preferably immutable) and must provide a constructor of type
 	/// matching the signature of: (PersistentClass, SessionFactoryImplementor)
 	/// </remarks>
-	public partial interface IEntityPersister : IOptimisticCacheSource
+	public partial interface IEntityPersister : IFilterable, IOptimisticCacheSource
 	{
 		/// <summary>
 		/// The ISessionFactory to which this persister "belongs".

src/NHibernate/Persister/Entity/IFilterable.cs

@@ -0,0 +1,21 @@
+using System.Collections.Generic;
+using NHibernate.Util;
+
+namespace NHibernate.Persister.Entity
+{
+	/// <summary>
+	/// Defines a contract for filtering entities implemented by persisters.
+	/// </summary>
+	public interface IFilterable
+	{
+		FilterHelper FilterHelper { get; }
+		
+		/// <summary>
+		/// Get the where clause filter, given a query alias and considering enabled session filters.
+		/// </summary>
+		/// <param name="alias"></param>
+		/// <param name="enabledFilters"></param>
+		/// <returns></returns>
+		string FilterFragment(string alias, IDictionary<string, IFilter> enabledFilters);
+	}
+}

src/NHibernate/Persister/Entity/IJoinable.cs

@@ -7,7 +7,7 @@ namespace NHibernate.Persister.Entity
 	/// <summary>
 	/// Anything that can be loaded by outer join - namely persisters for classes or collections.
 	/// </summary>
-	public interface IJoinable
+	public interface IJoinable: IFilterable
 	{
 		// Should this interface extend PropertyMapping?
 
@@ -65,11 +65,6 @@ string SelectFragment(IJoinable rhs, string rhsAlias, string lhsAlias, string cu
 		/// <returns></returns>
 		SqlString FromJoinFragment(string alias, bool innerJoin, bool includeSubclasses);
 
-		/// <summary>
-		/// Get the where clause filter, given a query alias and considering enabled session filters
-		/// </summary>
-		string FilterFragment(string alias, IDictionary<string, IFilter> enabledFilters);
-
 		string OneToManyFilterFragment(string alias);
 
 		/// <summary>