Merge pull request #94 from firo222/master

fixed: cant change from bag to list in convention

Author: jagregory

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

@@ -199,7 +199,19 @@ public void ShouldSetTableNameProperty()
 
             VerifyModel(x => x.TableName.ShouldEqual("xxx"));
         }
+        
+        [Test]
+        public void ShouldChangeCollectionTypeToList()
+        {
+            Convention(x => { x.AsList(); x.Index.Column("position"); } );
 
+            VerifyModel(x =>
+            {
+                x.Collection.ShouldEqual(Collection.List);
+                x.Index.ShouldNotBeNull();  // a list without index will result in wrong xml
+            });
+        }
+        
         #region Helpers
 
         private void Convention(Action<ICollectionInstance> convention)

src/FluentNHibernate/Conventions/Instances/CollectionInstance.cs

@@ -173,6 +173,14 @@ void ICollectionInstance.AsBag()
         void ICollectionInstance.AsList()
         {
             mapping.Collection = Collection.List;
+            if (mapping.Index == null)
+            {
+                var indexMapping = new IndexMapping();
+                var columnMapping = new ColumnMapping();
+                columnMapping.Set(x => x.Name, Layer.Defaults, "Index");
+                indexMapping.AddColumn(Layer.Defaults, columnMapping);
+                mapping.Set(x => x.Index, Layer.Defaults, indexMapping);
+            };
         }
 
         void ICollectionInstance.AsMap()

src/FluentNHibernate/Conventions/Instances/ColumnInstance.cs

@@ -18,5 +18,15 @@ public ColumnInstance(Type parentType, ColumnMapping mapping)
         {
             mapping.Set(x => x.Length, Layer.Conventions, length);
         }
+
+        public new void Index(string indexname)
+        {
+            mapping.Set(x => x.Index, Layer.Conventions, indexname);
+        }
+
+        public new void Default(string defaultvalue)
+        {
+            mapping.Set(x => x.Default, Layer.Conventions, defaultvalue);
+        }
     }
 }

src/FluentNHibernate/Conventions/Instances/IColumnInstance.cs

@@ -5,5 +5,7 @@ namespace FluentNHibernate.Conventions.Instances
     public interface IColumnInstance : IColumnInspector
     {
         new void Length(int length);
+        new void Index(string indexname);
+        new void Default(string defaultvalue);
     }
 }