Merge pull request #160 from chester89/componentFieldPrefix

Added ability to use a prefix when a component is mapped using backing field

Author: jagregory

src/FluentNHibernate.1.2.dotCover

@@ -0,0 +1,11 @@
+<Configuration>
+  <SnapshotDialog>
+    <InitialDirectory>D:\coding\fluent-nhibernate\src</InitialDirectory>
+  </SnapshotDialog>
+  <CoverageFilters>
+    <IncludeFilters>
+      <Filter ModuleMask="*" ClassMask="*" FunctionMask="*" />
+    </IncludeFilters>
+    <ExcludeFilters />
+  </CoverageFilters>
+</Configuration>

src/FluentNHibernate.Testing/Visitors/ComponentColumnPrefixVisitorSpecs.cs

@@ -203,6 +203,57 @@ public void should_prefix_property_columns()
         }
     }
 
+    [TestFixture]
+    public class when_the_component_column_prefix_visitor_processes_a_component_with_a_prefix_using_field_alias : ComponentColumnPrefixVisitorSpec
+    {
+        PersistenceModel model;
+        IEnumerable<HibernateMapping> mappings;
+        ClassMapping targetMapping;
+        const string columnPrefix = "{property}";
+
+        public override void establish_context()
+        {
+            model = new PersistenceModel();
+
+            var componentMap = new ComponentMap<FieldComponent>();
+            componentMap.Map(x => x.X);
+            componentMap.Map(x => x.Y);
+
+            model.Add(componentMap);
+
+            var classMapping = new ClassMap<Root>();
+            classMapping.Id(r => r.Id);
+            classMapping.Component(Reveal.Member<Root, FieldComponent>("component"), cpt => cpt.Access.Field().ColumnPrefix(columnPrefix));
+            model.Add(classMapping);
+        }
+
+        public override void because()
+        {
+            mappings = model.BuildMappings().ToList();
+            targetMapping = mappings.SelectMany(x => x.Classes).FirstOrDefault(x => x.Type == typeof(Root));
+        }
+
+        [Test]
+        public void should_prefix_field_columns()
+        {
+            targetMapping.Components.Single()
+                .Properties.SelectMany(x => x.Columns)
+                .Each(c => c.Name.ShouldStartWith("component"));
+        }
+    }
+
+    class Root
+    {
+        FieldComponent component;
+        public int Id { get; set; }
+    }
+
+    class FieldComponent
+    {
+        public string X { get; set; }
+        public int? Y { get; set; }
+    }
+
     public abstract class ComponentColumnPrefixVisitorSpec : Specification
     {
         protected AnyMapping any_with_column(string column)

src/FluentNHibernate/Mapping/ComponentMap.cs

@@ -54,7 +54,7 @@ public override ReferenceComponentPart<TComponent> Component<TComponent>(Express
 
         protected override ComponentMapping CreateComponentMappingRoot(AttributeStore store)
         {
-            return new ExternalComponentMapping(ComponentType.Component, attributes.Clone());
+            return new ExternalComponentMapping(ComponentType.Component, attributes.Clone(), member);
         }
 
         ExternalComponentMapping IExternalComponentMappingProvider.GetComponentMapping()

src/FluentNHibernate/Mapping/ComponentPart.cs

@@ -22,6 +22,11 @@ private ComponentPart(Type entity, Member property, AttributeStore attributes)
             this.entity = entity;
         }
 
+        /// <summary>
+        /// Sets the prefix for every column defined within the component. To refer to the name of a member that exposes
+        /// the component use {property}
+        /// </summary>
+        /// <param name="prefix"></param>
         public void ColumnPrefix(string prefix)
         {
             columnPrefix = prefix;
@@ -44,7 +49,7 @@ IComponentMapping IComponentMappingProvider.GetComponentMapping()
 
         protected override ComponentMapping CreateComponentMappingRoot(AttributeStore store)
         {
-            var componentMappingRoot = new ComponentMapping(ComponentType.Component, store)
+            var componentMappingRoot = new ComponentMapping(ComponentType.Component, store, member)
             {
                 ContainingEntityType = entity
             };

src/FluentNHibernate/Mapping/ComponentPartBase.cs

@@ -10,7 +10,7 @@ namespace FluentNHibernate.Mapping
     public abstract class ComponentPartBase<TEntity, TBuilder> : ClasslikeMapBase<TEntity>
         where TBuilder : ComponentPartBase<TEntity, TBuilder>
     {
-        readonly Member member;
+        protected readonly Member member;
         readonly MappingProviderStore providers;
         readonly AccessStrategyBuilder<TBuilder> access;
         readonly AttributeStore attributes;

src/FluentNHibernate/Mapping/DynamicComponentPart.cs

@@ -23,7 +23,7 @@ private DynamicComponentPart(Type entity, Member member, AttributeStore underlyi
 
         protected override ComponentMapping CreateComponentMappingRoot(AttributeStore store)
         {
-            return new ComponentMapping(ComponentType.DynamicComponent, store)
+            return new ComponentMapping(ComponentType.DynamicComponent, store, member)
             {
                 ContainingEntityType = entity
             };

src/FluentNHibernate/MappingModel/ClassBased/ComponentMapping.cs

@@ -11,15 +11,14 @@ public class ComponentMapping : ComponentMappingBase, IComponentMapping
         public ComponentType ComponentType { get; set; }
         readonly AttributeStore attributes;
 
-        public ComponentMapping(ComponentType componentType)
-            : this(componentType, new AttributeStore())
+        public ComponentMapping(ComponentType componentType): this(componentType, new AttributeStore(), null)
         {}
 
-        public ComponentMapping(ComponentType componentType, AttributeStore attributes)
-            : base(attributes)
+        public ComponentMapping(ComponentType componentType, AttributeStore attributes, Member member): base(attributes)
         {
             ComponentType = componentType;
             this.attributes = attributes;
+            Member = member;
         }
 
         public override void AcceptVisitor(IMappingModelVisitor visitor)

src/FluentNHibernate/MappingModel/ClassBased/ExternalComponentMapping.cs

@@ -8,12 +8,11 @@ namespace FluentNHibernate.MappingModel.ClassBased
     [Serializable]
     public class ExternalComponentMapping : ComponentMapping
     {
-        public ExternalComponentMapping(ComponentType componentType)
-            : this(componentType, new AttributeStore())
+        public ExternalComponentMapping(ComponentType componentType): this(componentType, new AttributeStore(), null)
         {}
 
-        public ExternalComponentMapping(ComponentType componentType, AttributeStore underlyingStore)
-            : base(componentType, underlyingStore)
+        public ExternalComponentMapping(ComponentType componentType, AttributeStore underlyingStore, Member member)
+            : base(componentType, underlyingStore, member)
         {}
     }
 }