Merge pull request #267 from Micha-kun/master

Fix for bug #231

Author: chester89

src/FluentNHibernate.Testing/MappingModel/Output/XmlKeyPropertyWriterTester.cs

@@ -64,5 +64,14 @@ public void ShouldWriteLengthAttribute()
 
             testHelper.VerifyAll(writer);
         }
+
+        [Test(Description = "Bug #231 :: Bug when trying to change varchar length for CompositeId")]
+        public void WhenKeyPropertyMappingContainsLengthAndCustomColumnLengthAttributeIsRenderedIntoColumnElement()
+        {
+            var keyPropertyMapping = new KeyPropertyMapping();
+            keyPropertyMapping.Set(propertyMapping => propertyMapping.Length, Layer.Defaults, 2);
+            keyPropertyMapping.AddColumn(new ColumnMapping());
+            writer.VerifyXml(keyPropertyMapping).DoesntHaveAttribute("length").Element("column").HasAttribute("length", "2");
+        }
     }
 }

src/FluentNHibernate/MappingModel/Output/XmlKeyPropertyWriter.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Linq;
 using System.Xml;
 using FluentNHibernate.MappingModel.Identity;
 using FluentNHibernate.Utils;
@@ -39,7 +40,19 @@ public override void ProcessKeyProperty(KeyPropertyMapping mapping)
                 element.WithAtt("type", mapping.Type);
 
             if (mapping.IsSpecified("Length"))
-                element.WithAtt("length", mapping.Length);
+            {
+                if (mapping.Columns.Any())
+                {
+                    foreach (var columnMapping in mapping.Columns.Where(column => !column.IsSpecified("Length")))
+                    {
+                        columnMapping.Set(map => map.Length, Layer.Defaults, mapping.Length);
+                    }   
+                }
+                else
+                {
+                    element.WithAtt("length", mapping.Length);
+                }
+            }
         }
 
         public override void Visit(ColumnMapping columnMapping)