Fixed CompositeId.KeyProperty - enums as strings

Enums -- by default -- are always mapped as a string with FNH; however, CompositeId.KeyProperty wasn't following this convention.
nhibernate · May 1, 2010 · 3a131dc · 3a131dc
1 parent c7017fd
commit 3a131dc
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 6 deletions.
diff --git a/src/FluentNHibernate.Testing/DomainModel/Mapping/CompositeIdentityPartTester.cs b/src/FluentNHibernate.Testing/DomainModel/Mapping/CompositeIdentityPartTester.cs
@@ -1,3 +1,5 @@
+using System;
+using FluentNHibernate.Mapping;
 using NUnit.Framework;
 
 namespace FluentNHibernate.Testing.DomainModel.Mapping
@@ -67,6 +69,16 @@ public void KeyManyToOneForeignKey()
                 .Element("class/composite-id/key-many-to-one").HasAttribute("foreign-key", "fk1");
         }
 
+        [Test]
+        public void KeyPropertyEnumShouldBeStringByDefault()
+        {
+            new MappingTester<CompIdTarget>()
+                .ForMapping(c =>
+                    c.CompositeId()
+                        .KeyProperty(x => x.EnumProperty))
+                .Element("class/composite-id/key-property")
+                    .HasAttribute("type", typeof(GenericEnumMapper<SomeEnum>).AssemblyQualifiedName);
+        }
 
         [Test]
         public void MixedKeyPropertyAndManyToOne()
@@ -133,8 +145,12 @@ public class CompIdTarget
             public virtual ComponentKey Key { get; set; }
             public virtual CompIdChild Child { get; set; }
             public virtual string DummyProp { get; set; }
+            public virtual SomeEnum EnumProperty { get; set; }
         }
 
+        public enum SomeEnum
+        {}
+
         public class CompIdChild
         {
             public virtual long ChildId { get; set; }

diff --git a/src/FluentNHibernate/Automapping/AutoCompositeIdentityPart.cs b/src/FluentNHibernate/Automapping/AutoCompositeIdentityPart.cs
@@ -14,11 +14,11 @@ public AutoCompositeIdentityPart(IList<Member> mappedMembers)
             this.mappedMembers = mappedMembers;
         }
 
-        protected override CompositeIdentityPart<T> KeyProperty(Member property, string columnName, Action<KeyPropertyPart> customMapping)
+        protected override CompositeIdentityPart<T> KeyProperty(Member member, string columnName, Action<KeyPropertyPart> customMapping)
         {
-            mappedMembers.Add(property);
+            mappedMembers.Add(member);
 
-            return base.KeyProperty(property, columnName, customMapping);
+            return base.KeyProperty(member, columnName, customMapping);
         }
 
         protected override CompositeIdentityPart<T> KeyReference(Member property, string columnName, Action<KeyManyToOnePart> customMapping)

diff --git a/src/FluentNHibernate/Mapping/CompositeIdentityPart.cs b/src/FluentNHibernate/Mapping/CompositeIdentityPart.cs
@@ -67,12 +67,17 @@ public CompositeIdentityPart<T> KeyProperty(Expression<Func<T, object>> expressi
             return KeyProperty(member, string.Empty, keyPropertyAction);
         }
 
-        protected virtual CompositeIdentityPart<T> KeyProperty(Member property, string columnName, Action<KeyPropertyPart> customMapping)
+        protected virtual CompositeIdentityPart<T> KeyProperty(Member member, string columnName, Action<KeyPropertyPart> customMapping)
         {
+            var type = member.PropertyType;
+
+            if (type.IsEnum)
+                type = typeof(GenericEnumMapper<>).MakeGenericType(type);
+
             var key = new KeyPropertyMapping
             {
-                Name = property.Name,
-                Type = new TypeReference(property.PropertyType),
+                Name = member.Name,
+                Type = new TypeReference(type),
                 ContainingEntityType = typeof(T)
             };