@@ -929,5 +929,28 @@ namespace FluentNHibernate.Testing.DomainModel.Mapping .ForMapping(m => m.HasMany(x => x.MapOfChildren).KeyColumns.Add("key_col", c => c.Unique())) .Element("class/bag/key/column").HasAttribute("unique", "true"); } + + + [Test] + public void CanSpecifySqlTypeOnElementColumn() + { + new MappingTester<OneToManyTarget>() + .ForMapping(map => map.HasMany(x => x.MapOfEnums) + .AsMap<MapIndex>( + index => index.Column("IndexColumn"), + element => element.Columns.Add("elementColumn", c => c.SqlType("ntext")))) + .Element("class/map/element/column").HasAttribute("sql-type", "ntext"); + } + + [Test] + public void CanSpecifyAdditionalColumnWithSqlTypeOnElement() + { + new MappingTester<OneToManyTarget>() + .ForMapping(m => m.HasMany(x => x.MapOfChildren) + .Element("colName", e => e.Columns.Add("additionalColumn", c => c.SqlType("ntext")))) + .Element("class/bag/element/column[@name='colName']").DoesntHaveAttribute("sql-type") + .Element("class/bag/element/column[@name='additionalColumn']").HasAttribute("sql-type", "ntext"); + } + } } src/FluentNHibernate.Testing/DomainModel/Mapping/OneToManyTester.cs @@ -10,11 +10,12 @@ namespace FluentNHibernate.Mapping { private readonly Type entity; private readonly AttributeStore<ElementMapping> attributes = new AttributeStore<ElementMapping>(); - private IList<string> columns = new List<string>(); + private readonly ColumnMappingCollection<ElementPart> columns; public ElementPart(Type entity) { this.entity = entity; + columns = new ColumnMappingCollection<ElementPart>(this); } public ElementPart Column(string elementColumnName) @@ -23,6 +24,11 @@ namespace FluentNHibernate.Mapping return this; } + public ColumnMappingCollection<ElementPart> Columns + { + get { return columns; } + } + public ElementPart Type<TElement>() { attributes.Set(x => x.Type, new TypeReference(typeof(TElement))); @@ -32,10 +38,10 @@ namespace FluentNHibernate.Mapping public ElementMapping GetElementMapping() { var mapping = new ElementMapping(attributes.CloneInner()); - mapping.ContainingEntityType = entity; - columns.Each(x => mapping.AddColumn(new ColumnMapping { Name = x })); + foreach (var column in Columns) + mapping.AddColumn(column); return mapping; } src/FluentNHibernate/Mapping/ElementPart.cs d86698eb043e367f3eb38318014bf3caccd9a11c Paul Batum paul.batum@gmail.com http://github.com/jagregory/fluent-nhibernate/commit/69edec152912cb08003aed7c7e5c148e8879e245 69edec152912cb08003aed7c7e5c148e8879e245 2009-11-02T23:11:59-08:00 2009-11-02T23:11:59-08:00 Modified ElementPart to use a ColumnMappingCollection so that users can control the column attributes. Resolves issue #341. 36a0fb12b88dac01eb7d269afc58ede0a6b9f755 Paul Batum paul.batum@gmail.com