* FilterDefinitions are now also copied in Automapping.AlterModel

ToJans · Apr 19, 2010 · 29058de · 29058de · ragamuf · Feb 14, 2011
1 parent d2f3887
commit 29058de
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 0 deletions.
diff --git a/src/FluentNHibernate/Automapping/AutoMapping.cs b/src/FluentNHibernate/Automapping/AutoMapping.cs
@@ -75,6 +75,9 @@ void IAutoClasslike.AlterModel(ClassMappingBase mapping)
 
             foreach (var storedProcedure in storedProcedures)
                 mapping.AddStoredProcedure(storedProcedure.GetStoredProcedureMapping());
+
+            foreach (var filter in filters)
+                mapping.AddOrReplaceFilter(filter.GetFilterMapping());
         }
 
         protected override OneToManyPart<TChild> HasMany<TChild>(Member property)

diff --git a/src/FluentNHibernate/MappingModel/ClassBased/ClassMappingBase.cs b/src/FluentNHibernate/MappingModel/ClassBased/ClassMappingBase.cs
@@ -149,6 +149,11 @@ public void AddFilter(FilterMapping mapping)
             mappedMembers.AddFilter(mapping);
         }
 
+        public void AddOrReplaceFilter(FilterMapping mapping)
+        {
+            mappedMembers.AddOrReplaceFilter(mapping);
+        }
+
         public void AddSubclass(SubclassMapping subclass)
         {
             subclasses.Add(subclass);
@@ -190,5 +195,6 @@ public override int GetHashCode()
                 return ((mappedMembers != null ? mappedMembers.GetHashCode() : 0) * 397) ^ (subclasses != null ? subclasses.GetHashCode() : 0);
             }
         }
+
     }
 }
diff --git a/src/FluentNHibernate/MappingModel/MappedMembers.cs b/src/FluentNHibernate/MappingModel/MappedMembers.cs
@@ -71,6 +71,15 @@ public IEnumerable<FilterMapping> Filters
             get { return filters; }
         }
 
+        public void AddOrReplaceFilter(FilterMapping mapping)
+        {
+            var filter = filters.Find(x => x.Name == mapping.Name);
+            if (filter != null)
+                filters.Remove(filter);
+            filters.Add(mapping);
+        }
+
+
         public IEnumerable<StoredProcedureMapping> StoredProcedures
         {
             get { return storedProcedures; }
@@ -255,5 +264,6 @@ public override int GetHashCode()
                 return result;
             }
         }
+
     }
 }