1. filter should apply to subclass not superclass

2. add test case

Author: mrhihi

src/NHibernate.Test/NHSpecificTest/NH2053/Animal.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace NHibernate.Test.NHSpecificTest.NH2053
+{
+    public class Animal
+	{
+        public virtual int AnimalId { get; set; }
+		public virtual string Name { get; set; }
+	}
+}

src/NHibernate.Test/NHSpecificTest/NH2053/Cat.cs

@@ -0,0 +1,11 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace NHibernate.Test.NHSpecificTest.NH2053
+{
+    public class Cat: Animal
+    {
+    }
+}

src/NHibernate.Test/NHSpecificTest/NH2053/Dog.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace NHibernate.Test.NHSpecificTest.NH2053
+{
+    public class Dog: Animal
+    {
+        public virtual Boolean Talkable { get; set; }
+    }
+}

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

@@ -0,0 +1,86 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Text;
+using NHibernate.Dialect;
+using NUnit.Framework;
+
+namespace NHibernate.Test.NHSpecificTest.NH2053
+{
+	[TestFixture]
+	public class Fixture : BugTestCase
+	{
+		protected override bool AppliesTo(NHibernate.Dialect.Dialect dialect)
+		{
+			return dialect is MsSql2005Dialect;
+		}
+		protected override void OnSetUp()
+		{
+			using (var session = this.OpenSession())
+			{
+				using (var tran = session.BeginTransaction())
+				{
+                    Dog snoopy = new Dog()
+                    {
+                        Name = "Snoopy",
+                        Talkable = false
+                    };
+                    snoopy.Name = "Snoopy";
+                    Dog Jake = new Dog()
+                    {
+                        Name = "Jake the dog",
+                        Talkable = true
+                    };
+                    session.Save(snoopy);
+                    session.Save(Jake);
+                    Cat kitty = new Cat()
+                    {
+                        Name = "Kitty"
+                    };
+                    session.Save(kitty);
+					tran.Commit();
+				}
+			}
+		}
+		protected override void OnTearDown()
+		{
+			using (var session = this.OpenSession())
+			{
+				using (var tran = session.BeginTransaction())
+				{
+					session.Delete("from Dog");
+                    session.Delete("from Animal");
+                    tran.Commit();
+				}
+			}
+		}
+
+		[Test]
+		public void JoinedSubClass_Filter()
+		{
+			using (var session = this.OpenSession())
+			{
+				using (var tran = session.BeginTransaction())
+				{
+                    /*
+                     * This is not a good case for this feature.
+                     * In my case.
+                     * 
+                     */
+                    session.EnableFilter("talkableFilter").SetParameter("talkable", true);
+                    var snoopy = session.QueryOver<Dog>().Where(x => x.Name == "Snoopy").SingleOrDefault();
+                    Assert.AreEqual(null, snoopy); // there are no talking dog named Snoopy.
+
+                    var jake = session.QueryOver<Dog>().Where(x => x.Name == "Jake the dog").SingleOrDefault();
+                    Assert.AreNotEqual(null, jake);
+                    Assert.AreEqual("Jake the dog", jake.Name);
+
+                    var kitty = session.QueryOver<Cat>().Where(x => x.Name == "Kitty").SingleOrDefault();
+                    Assert.AreNotEqual(null, kitty);
+                    Assert.AreEqual("Kitty", kitty.Name);
+				}
+			}
+		}
+
+	}
+}

src/NHibernate.Test/NHSpecificTest/NH2053/Mappings.hbm.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2"
+                   assembly="NHibernate.Test"
+                   namespace="NHibernate.Test.NHSpecificTest.NH2053">
+
+	<class name="Animal">
+		<id name="AnimalId">
+			<generator class="identity"/>
+		</id>
+		<property name="Name"/>
+	</class>
+  <joined-subclass
+    extends="Animal"
+    name="Dog">
+    <key column="AnimalId" />
+    <property column="Talkable" type="Boolean" name="Talkable" not-null="true"></property>
+    <filter name="talkableFilter" condition="Talkable = :talkable" />
+  </joined-subclass>
+  <joined-subclass
+    extends="Animal"
+    name="Cat">
+    <key column="AnimalId" />
+  </joined-subclass>
+  <filter-def name="talkableFilter">
+    <filter-param name="talkable" type="Boolean"/>
+  </filter-def>
+
+</hibernate-mapping>

src/NHibernate.Test/NHibernate.Test.csproj

@@ -688,6 +688,10 @@
     <Compile Include="NHSpecificTest\BagWithLazyExtraAndFilter\Fixture.cs" />
     <Compile Include="Linq\ByMethod\DistinctTests.cs" />
     <Compile Include="Component\Basic\ComponentWithUniqueConstraintTests.cs" />
+    <Compile Include="NHSpecificTest\NH2053\Cat.cs" />
+    <Compile Include="NHSpecificTest\NH2053\Dog.cs" />
+    <Compile Include="NHSpecificTest\NH2053\Fixture.cs" />
+    <Compile Include="NHSpecificTest\NH2053\Animal.cs" />
     <Compile Include="NHSpecificTest\NH3620\Fixture.cs" />
     <Compile Include="NHSpecificTest\NH3620\TwoBlobs.cs" />
     <Compile Include="NHSpecificTest\NH3455\Address.cs" />
@@ -3052,6 +3056,7 @@
     <EmbeddedResource Include="NHSpecificTest\NH1291AnonExample\Mappings.hbm.xml" />
   </ItemGroup>
   <ItemGroup>
+    <EmbeddedResource Include="NHSpecificTest\NH2053\Mappings.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH3455\Mappings.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH3590\Mappings.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH3377\Mappings.hbm.xml" />

src/NHibernate/Cfg/XmlHbmBinding/JoinedSubclassBinder.cs

@@ -21,7 +21,6 @@ public void Bind(HbmJoinedSubclass joinedSubclassMapping, IDictionary<string, Me
 		{
 			PersistentClass superModel = GetSuperclass(joinedSubclassMapping.extends);
 			HandleJoinedSubclass(superModel, joinedSubclassMapping, inheritedMetas);
-            new FiltersBinder(superModel, Mappings).Bind(joinedSubclassMapping.filter);
 		}
 
 		public void HandleJoinedSubclass(PersistentClass model, HbmJoinedSubclass joinedSubclassMapping, IDictionary<string, MetaAttribute> inheritedMetas)
@@ -63,6 +62,8 @@ public void HandleJoinedSubclass(PersistentClass model, HbmJoinedSubclass joined
 
 			BindJoinedSubclasses(joinedSubclassMapping.JoinedSubclasses, subclass, inheritedMetas);
 
+            new FiltersBinder(subclass, Mappings).Bind(joinedSubclassMapping.filter);
+
 			model.AddSubclass(subclass);
 			mappings.AddClass(subclass);
 		}

src/NHibernate/Cfg/XmlHbmBinding/SubclassBinder.cs

@@ -21,7 +21,6 @@ public void Bind(HbmSubclass subClassMapping, IDictionary<string, MetaAttribute>
 		{
 			PersistentClass superModel = GetSuperclass(subClassMapping.extends);
 			HandleSubclass(superModel, subClassMapping, inheritedMetas);
-			new FiltersBinder(superModel, Mappings).Bind(subClassMapping.filter);
 		}
 
 		public void HandleSubclass(PersistentClass model, HbmSubclass subClassMapping, IDictionary<string, MetaAttribute> inheritedMetas)
@@ -43,7 +42,9 @@ public void HandleSubclass(PersistentClass model, HbmSubclass subClassMapping, I
 
 			model.AddSubclass(subclass);
 			mappings.AddClass(subclass);
-		}
+
+            new FiltersBinder(model, Mappings).Bind(subClassMapping.filter);
+        }
 
 	}
 }

src/NHibernate/Mapping/Subclass.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Linq;
 using NHibernate.Engine;
 using NHibernate.Util;
 
@@ -157,7 +158,14 @@ public override ISet<string> SynchronizedTables
 
 		public override IDictionary<string, string> FilterMap
 		{
-			get { return Superclass.FilterMap; }
+			get {
+                var superclassFilters = Superclass.FilterMap;
+                var subclassFilters = base.FilterMap;
+
+                return superclassFilters.Union(
+                        subclassFilters
+                ).ToDictionary(k => k.Key, v => v.Value);
+            }
 		}
 
 		public override IDictionary<EntityMode, string> TuplizerMap

src/NHibernate/nhibernate-mapping.xsd

@@ -676,6 +676,7 @@
 					<xs:element ref="idbag" />
 					<xs:element ref="array" />
 					<xs:element ref="primitive-array" />
+					<xs:element ref="filter" />
 				</xs:choice>
 				<xs:element ref="joined-subclass" minOccurs="0" maxOccurs="unbounded" />
 				<xs:element ref="loader" minOccurs="0" />
@@ -1353,6 +1354,7 @@
 					<xs:element ref="idbag" />
 					<xs:element ref="array" />
 					<xs:element ref="primitive-array" />
+					<xs:element ref="filter" />
 				</xs:choice>
 				<xs:element ref="join" minOccurs="0" maxOccurs="unbounded" />
 				<xs:element ref="subclass" minOccurs="0" maxOccurs="unbounded" />