fix for NH-2053 Extend the filter-def usage to subclasses

Author: mrhihi

src/NHibernate/Cfg/MappingSchema/Hbm.generated.cs

@@ -4033,7 +4033,11 @@ public partial class HbmJoinedSubclass {
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
         public string node;
-        
+
+        /// <remarks/>
+        [System.Xml.Serialization.XmlElementAttribute("filter")]
+        public HbmFilter[] filter;
+
         public HbmJoinedSubclass() {
             this.dynamicupdate = false;
             this.dynamicinsert = false;
@@ -4619,6 +4623,10 @@ public partial class HbmSubclass {
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
         public string node;
+
+        /// <remarks/>
+        [System.Xml.Serialization.XmlElementAttribute("filter")]
+        public HbmFilter[] filter;
 
         public HbmSubclass() {
             this.dynamicupdate = false;

src/NHibernate/Cfg/XmlHbmBinding/JoinedSubclassBinder.cs

@@ -21,6 +21,7 @@ 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)

src/NHibernate/Cfg/XmlHbmBinding/SubclassBinder.cs

@@ -21,6 +21,7 @@ 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)

src/NHibernate/Mapping/ByCode/IJoinedSubclassMapper.cs

@@ -10,6 +10,7 @@ public interface IJoinedSubclassAttributesMapper : IEntityAttributesMapper, IEnt
 		void Key(Action<IKeyMapper> keyMapping);
 		void Extends(System.Type baseType);
 		void SchemaAction(SchemaAction action);
+        void Filter(string filterName, Action<IFilterMapper> filterMapping);
 	}
 
 	public interface IJoinedSubclassMapper : IJoinedSubclassAttributesMapper, IPropertyContainerMapper {}
@@ -21,6 +22,7 @@ public interface IJoinedSubclassAttributesMapper<TEntity> : IEntityAttributesMap
 		void Schema(string schemaName);
 		void Key(Action<IKeyMapper<TEntity>> keyMapping);
 		void SchemaAction(SchemaAction action);
+        void Filter(string filterName, Action<IFilterMapper> filterMapping);
 	}
 
 	public interface IJoinedSubclassMapper<TEntity> : IJoinedSubclassAttributesMapper<TEntity>, IPropertyContainerMapper<TEntity> where TEntity : class {}

src/NHibernate/Mapping/ByCode/ISubclassMapper.cs

@@ -6,6 +6,7 @@ public interface ISubclassAttributesMapper : IEntityAttributesMapper, IEntitySql
 	{
 		void DiscriminatorValue(object value);
 		void Extends(System.Type baseType);
+		void Filter(string filterName, Action<IFilterMapper> filterMapping);
 	}
 
 	public interface ISubclassMapper : ISubclassAttributesMapper, IPropertyContainerMapper
@@ -16,6 +17,7 @@ public interface ISubclassMapper : ISubclassAttributesMapper, IPropertyContainer
 	public interface ISubclassAttributesMapper<TEntity> : IEntityAttributesMapper, IEntitySqlsMapper where TEntity : class
 	{
 		void DiscriminatorValue(object value);
+		void Filter(string filterName, Action<IFilterMapper> filterMapping);
 	}
 
 	public interface ISubclassMapper<TEntity> : ISubclassAttributesMapper<TEntity>, IPropertyContainerMapper<TEntity> where TEntity : class

src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/JoinedSubclassCustomizer.cs

@@ -127,6 +127,11 @@ public void Schema(string schemaName)
 			CustomizersHolder.AddCustomizer(typeof (TEntity), (IJoinedSubclassAttributesMapper m) => m.Schema(schemaName));
 		}
 
+        public void Filter(string filterName, Action<IFilterMapper> filterMapping)
+        {
+            CustomizersHolder.AddCustomizer(typeof(TEntity), (IJoinedSubclassAttributesMapper m) => m.Filter(filterName, filterMapping));
+        }
+
 		#endregion
 
 		#region IConformistHoldersProvider Members

src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/SubclassCustomizer.cs

@@ -28,6 +28,11 @@ public void DiscriminatorValue(object value)
 			CustomizersHolder.AddCustomizer(typeof (TEntity), (ISubclassMapper m) => m.DiscriminatorValue(value));
 		}
 
+		public void Filter(string filterName, Action<IFilterMapper> filterMapping)
+		{
+			CustomizersHolder.AddCustomizer(typeof(TEntity), (IJoinedSubclassAttributesMapper m) => m.Filter(filterName, filterMapping));
+		}
+
 		#endregion
 
 		private Dictionary<string, IJoinMapper<TEntity>> JoinCustomizers

src/NHibernate/Mapping/ByCode/Impl/JoinedSubclassMapper.cs

@@ -189,6 +189,19 @@ public void SchemaAction(SchemaAction action)
 			classMapping.schemaaction = action.ToSchemaActionString();
 		}
 
+		public void Filter(string filterName, Action<IFilterMapper> filterMapping)
+		{
+			if (filterMapping == null)
+			{
+				filterMapping = x => { };
+			}
+			var hbmFilter = new HbmFilter();
+			var filterMapper = new FilterMapper(filterName, hbmFilter);
+			filterMapping(filterMapper);
+			Dictionary<string, HbmFilter> filters = classMapping.filter != null ? classMapping.filter.ToDictionary(f => f.name, f => f) : new Dictionary<string, HbmFilter>(1);
+			filters[filterName] = hbmFilter;
+			classMapping.filter = filters.Values.ToArray();
+		}
 		#endregion
 	}
 }

src/NHibernate/Mapping/ByCode/Impl/SubclassMapper.cs

@@ -177,6 +177,19 @@ public void SqlDelete(string sql)
 
 		public void Subselect(string sql) {}
 
+		public void Filter(string filterName, Action<IFilterMapper> filterMapping)
+		{
+			if (filterMapping == null)
+			{
+				filterMapping = x => { };
+			}
+			var hbmFilter = new HbmFilter();
+			var filterMapper = new FilterMapper(filterName, hbmFilter);
+			filterMapping(filterMapper);
+			Dictionary<string, HbmFilter> filters = classMapping.filter != null ? classMapping.filter.ToDictionary(f => f.name, f => f) : new Dictionary<string, HbmFilter>(1);
+			filters[filterName] = hbmFilter;
+			classMapping.filter = filters.Values.ToArray();
+		}
 		#endregion
 	}
 }