Added ability specify collection element column name in conventions.

ashmind · ashmind · commit ecef14074f5b · 2011-04-02T20:29:10.000+04:00
diff --git a/src/FluentNHibernate.Testing/ConventionsTests/ApplyingToModel/HasManyCollectionConventionTests.cs b/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()
         {
diff --git a/src/FluentNHibernate.Testing/ConventionsTests/ApplyingToModel/HasManyConventionTests.cs b/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()
         {
diff --git a/src/FluentNHibernate.Testing/ConventionsTests/ApplyingToModel/HasManyToManyCollectionConventionTests.cs b/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()
         {
diff --git a/src/FluentNHibernate.Testing/ConventionsTests/ApplyingToModel/HasManyToManyConventionTests.cs b/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()
         {
diff --git a/src/FluentNHibernate.Testing/ConventionsTests/OverridingFluentInterface/HasManyCollectionConventionTests.cs b/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()
         {
diff --git a/src/FluentNHibernate.Testing/ConventionsTests/OverridingFluentInterface/HasManyConventionTests.cs b/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()
         {
diff --git a/src/FluentNHibernate.Testing/ConventionsTests/OverridingFluentInterface/HasManyToManyCollectionConventionTests.cs b/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()
         {
diff --git a/src/FluentNHibernate.Testing/ConventionsTests/OverridingFluentInterface/HasManyToManyConventionTests.cs b/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()
         {
diff --git a/src/FluentNHibernate/Conventions/Instances/ElementInstance.cs b/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"))
diff --git a/src/FluentNHibernate/Conventions/Instances/IElementInstance.cs b/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);
     }
 }
diff --git a/src/FluentNHibernate/MappingModel/Collections/ElementMapping.cs b/src/FluentNHibernate/MappingModel/Collections/ElementMapping.cs
@@ -1,14 +1,13 @@
 using System;
 using System.Collections.Generic;
 using System.Linq.Expressions;
-using System.Reflection;
-using FluentNHibernate.Utils;
+
 using FluentNHibernate.Visitors;
 
 namespace FluentNHibernate.MappingModel.Collections
 {
     [Serializable]
-    public class ElementMapping : MappingBase
+    public class ElementMapping : MappingBase, IHasColumnMappings
     {
         private readonly IDefaultableList<ColumnMapping> columns = new DefaultableList<ColumnMapping>();
         private readonly AttributeStore<ElementMapping> attributes;
@@ -58,7 +57,12 @@ public void AddDefaultColumn(ColumnMapping mapping)
             columns.AddDefault(mapping);
         }
 
-        public IEnumerable<ColumnMapping> Columns
+        public void ClearColumns()
+        {
+            columns.Clear();
+        }
+
+        public IDefaultableEnumerable<ColumnMapping> Columns
         {
             get { return columns; }
         }

Original file line number	Diff line number	Diff line change
`@@ -105,6 +105,14 @@ public void ShouldSetKeyColumnNameProperty()`
`105`	`105`	`VerifyModel(x => x.Key.Columns.First().Name.ShouldEqual("xxx"));`
`106`	`106`	`}`
`107`	`107`
	`108`	`+ [Test]`
	`109`	`+ public void ShouldSetElementColumnNameProperty()`
	`110`	`+ {`
	`111`	`+ Convention(x => x.Element.Column("xxx"));`
	`112`	`+`
	`113`	`+ VerifyModel(x => x.Element.Columns.First().Name.ShouldEqual("xxx"));`
	`114`	`+ }`
	`115`	`+`
`108`	`116`	`[Test]`
`109`	`117`	`public void ShouldSetElementTypePropertyUsingGeneric()`
`110`	`118`	`{`
Original file line number	Diff line number	Diff line change
`@@ -112,6 +112,14 @@ public void ShouldSetKeyColumnNameProperty()`
`112`	`112`	`VerifyModel(x => x.Key.Columns.First().Name.ShouldEqual("xxx"));`
`113`	`113`	`}`
`114`	`114`
	`115`	`+ [Test]`
	`116`	`+ public void ShouldSetElementColumnNameProperty()`
	`117`	`+ {`
	`118`	`+ Convention(x => x.Element.Column("xxx"));`
	`119`	`+`
	`120`	`+ VerifyModel(x => x.Element.Columns.First().Name.ShouldEqual("xxx"));`
	`121`	`+ }`
	`122`	`+`
`115`	`123`	`[Test]`
`116`	`124`	`public void ShouldSetElementTypePropertyUsingGeneric()`
`117`	`125`	`{`
Original file line number	Diff line number	Diff line change
`@@ -104,6 +104,14 @@ public void ShouldSetParentKeyColumnNameProperty()`
`104`	`104`	`VerifyModel(x => x.Key.Columns.First().Name.ShouldEqual("xxx"));`
`105`	`105`	`}`
`106`	`106`
	`107`	`+ [Test]`
	`108`	`+ public void ShouldSetElementColumnNameProperty()`
	`109`	`+ {`
	`110`	`+ Convention(x => x.Element.Column("xxx"));`
	`111`	`+`
	`112`	`+ VerifyModel(x => x.Element.Columns.First().Name.ShouldEqual("xxx"));`
	`113`	`+ }`
	`114`	`+`
`107`	`115`	`[Test]`
`108`	`116`	`public void ShouldSetElementTypePropertyUsingGeneric()`
`109`	`117`	`{`
Original file line number	Diff line number	Diff line change
`@@ -9,5 +9,6 @@ public interface IElementInstance : IElementInspector`
`9`	`9`	`new void Type<T>();`
`10`	`10`	`new void Type(string type);`
`11`	`11`	`new void Type(Type type);`
	`12`	`+ void Column(string name);`
`12`	`13`	`}`
`13`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,14 +1,13 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Collections.Generic;`
`3`	`3`	`using System.Linq.Expressions;`
`4`		`-using System.Reflection;`
`5`		`-using FluentNHibernate.Utils;`
	`4`	`+`
`6`	`5`	`using FluentNHibernate.Visitors;`
`7`	`6`
`8`	`7`	`namespace FluentNHibernate.MappingModel.Collections`
`9`	`8`	`{`
`10`	`9`	`[Serializable]`
`11`		`- public class ElementMapping : MappingBase`
	`10`	`+ public class ElementMapping : MappingBase, IHasColumnMappings`
`12`	`11`	`{`
`13`	`12`	`private readonly IDefaultableList<ColumnMapping> columns = new DefaultableList<ColumnMapping>();`
`14`	`13`	`private readonly AttributeStore<ElementMapping> attributes;`
`@@ -58,7 +57,12 @@ public void AddDefaultColumn(ColumnMapping mapping)`
`58`	`57`	`columns.AddDefault(mapping);`
`59`	`58`	`}`
`60`	`59`
`61`		`- public IEnumerable<ColumnMapping> Columns`
	`60`	`+ public void ClearColumns()`
	`61`	`+ {`
	`62`	`+ columns.Clear();`
	`63`	`+ }`
	`64`	`+`
	`65`	`+ public IDefaultableEnumerable<ColumnMapping> Columns`
`62`	`66`	`{`
`63`	`67`	`get { return columns; }`
`64`	`68`	`}`