Added ability specify collection element column name in conventions.

Author: ashmind

src/FluentNHibernate.Testing/ConventionsTests/ApplyingToModel/HasManyCollectionConventionTests.cs

@@ -105,6 +105,14 @@ public void ShouldSetKeyColumnNameProperty()
             VerifyModel(x => x.Key.Columns.First().Name.ShouldEqual("xxx"));
         }
 
+        [Test]
+        public void ShouldSetElementColumnNameProperty()
+        {
+            Convention(x => x.Element.Column("xxx"));
+
+            VerifyModel(x => x.Element.Columns.First().Name.ShouldEqual("xxx"));
+        }
+
         [Test]
         public void ShouldSetElementTypePropertyUsingGeneric()
         {

src/FluentNHibernate.Testing/ConventionsTests/ApplyingToModel/HasManyConventionTests.cs

@@ -112,6 +112,14 @@ public void ShouldSetKeyColumnNameProperty()
             VerifyModel(x => x.Key.Columns.First().Name.ShouldEqual("xxx"));
         }
 
+        [Test]
+        public void ShouldSetElementColumnNameProperty()
+        {
+            Convention(x => x.Element.Column("xxx"));
+
+            VerifyModel(x => x.Element.Columns.First().Name.ShouldEqual("xxx"));
+        }
+
         [Test]
         public void ShouldSetElementTypePropertyUsingGeneric()
         {

src/FluentNHibernate.Testing/ConventionsTests/ApplyingToModel/HasManyToManyCollectionConventionTests.cs

@@ -105,6 +105,14 @@ public void ShouldSetParentKeyColumnNameProperty()
             VerifyModel(x => x.Key.Columns.First().Name.ShouldEqual("xxx"));
         }
 
+        [Test]
+        public void ShouldSetElementColumnNameProperty()
+        {
+            Convention(x => x.Element.Column("xxx"));
+
+            VerifyModel(x => x.Element.Columns.First().Name.ShouldEqual("xxx"));
+        }
+
         [Test]
         public void ShouldSetElementTypePropertyUsingGeneric()
         {

src/FluentNHibernate.Testing/ConventionsTests/ApplyingToModel/HasManyToManyConventionTests.cs

@@ -104,6 +104,14 @@ public void ShouldSetParentKeyColumnNameProperty()
             VerifyModel(x => x.Key.Columns.First().Name.ShouldEqual("xxx"));
         }
 
+        [Test]
+        public void ShouldSetElementColumnNameProperty()
+        {
+            Convention(x => x.Element.Column("xxx"));
+
+            VerifyModel(x => x.Element.Columns.First().Name.ShouldEqual("xxx"));
+        }
+
         [Test]
         public void ShouldSetElementTypePropertyUsingGeneric()
         {

src/FluentNHibernate.Testing/ConventionsTests/OverridingFluentInterface/HasManyCollectionConventionTests.cs

@@ -125,6 +125,16 @@ public void KeyColumnNameShouldntBeOverwritten()
             VerifyModel(x => x.Key.Columns.First().Name.ShouldEqual("name"));
         }
 
+        [Test]
+        public void ElementColumnNameShouldntBeOverwritten()
+        {
+            Mapping(x => x.Children, x => x.Element("name"));
+
+            Convention(x => x.Element.Column("xxx"));
+
+            VerifyModel(x => x.Element.Columns.First().Name.ShouldEqual("name"));
+        }
+
         [Test]
         public void ElementTypeShouldntBeOverwrittenUsingGeneric()
         {

src/FluentNHibernate.Testing/ConventionsTests/OverridingFluentInterface/HasManyConventionTests.cs

@@ -126,6 +126,16 @@ public void KeyColumnNameShouldntBeOverwritten()
             VerifyModel(x => x.Key.Columns.First().Name.ShouldEqual("name"));
         }
 
+        [Test]
+        public void ElementColumnNameShouldntBeOverwritten()
+        {
+            Mapping(x => x.Children, x => x.Element("name"));
+
+            Convention(x => x.Element.Column("xxx"));
+
+            VerifyModel(x => x.Element.Columns.First().Name.ShouldEqual("name"));
+        }
+
         [Test]
         public void ElementTypeShouldntBeOverwrittenUsingGeneric()
         {

src/FluentNHibernate.Testing/ConventionsTests/OverridingFluentInterface/HasManyToManyCollectionConventionTests.cs

@@ -127,6 +127,16 @@ public void ParentKeyColumnNameShouldntBeOverwritten()
             VerifyModel(x => x.Key.Columns.First().Name.ShouldEqual("name"));
         }
 
+        [Test]
+        public void ElementColumnNameShouldntBeOverwritten()
+        {
+            Mapping(x => x.Children, x => x.Element("name"));
+
+            Convention(x => x.Element.Column("xxx"));
+
+            VerifyModel(x => x.Element.Columns.First().Name.ShouldEqual("name"));
+        }
+
         [Test]
         public void ElementTypeShouldntBeOverwrittenUsingGeneric()
         {

src/FluentNHibernate.Testing/ConventionsTests/OverridingFluentInterface/HasManyToManyConventionTests.cs

@@ -126,6 +126,16 @@ public void ParentKeyColumnNameShouldntBeOverwritten()
             VerifyModel(x => x.Key.Columns.First().Name.ShouldEqual("name"));
         }
 
+        [Test]
+        public void ElementColumnNameShouldntBeOverwritten()
+        {
+            Mapping(x => x.Children, x => x.Element("name"));
+
+            Convention(x => x.Element.Column("xxx"));
+
+            VerifyModel(x => x.Element.Columns.First().Name.ShouldEqual("name"));
+        }
+
         [Test]
         public void ElementTypeShouldntBeOverwrittenUsingGeneric()
         {

src/FluentNHibernate/Conventions/Instances/ElementInstance.cs

@@ -1,4 +1,6 @@
 using System;
+using System.Linq;
+
 using FluentNHibernate.Conventions.Inspections;
 using FluentNHibernate.MappingModel;
 using FluentNHibernate.MappingModel.Collections;
@@ -15,6 +17,20 @@ public ElementInstance(ElementMapping mapping)
             this.mapping = mapping;
         }
 
+        public void Column(string columnName)
+        {
+            if (mapping.Columns.UserDefined.Count() > 0)
+                return;
+
+            var originalColumn = mapping.Columns.FirstOrDefault();
+            var column = originalColumn == null ? new ColumnMapping() : originalColumn.Clone();
+
+            column.Name = columnName;
+
+            mapping.ClearColumns();
+            mapping.AddColumn(column);
+        }
+
         public new void Type<T>()
         {
             if (!mapping.IsSpecified("Type"))

src/FluentNHibernate/Conventions/Instances/IElementInstance.cs

@@ -9,5 +9,6 @@ public interface IElementInstance : IElementInspector
         new void Type<T>();
         new void Type(string type);
         new void Type(Type type);
+        void Column(string name);
     }
 }