Merge pull request #186 from chester89/investigating-110

I think this one should close both #110 and #194

Author: chester89

src/FluentNHibernate.Specs/PersistenceModel/SubclassSpecs.cs

@@ -39,12 +39,12 @@ public class when_subclass_map_has_a_has_many_to_another_entity
             model.Add(new SpecialProductMap());
             model.Add(new OptionMap());
 
-            cfg = new Configuration();
-            SQLiteConfiguration.Standard.InMemory()
-                .ConfigureProperties(cfg);
-            model.Configure(cfg);
+            //cfg = new Configuration();
+            //SQLiteConfiguration.Standard.InMemory()
+            //    .ConfigureProperties(cfg);
+            //model.Configure(cfg);
 
-            new SchemaExport(cfg).Create(true, false);
+            //new SchemaExport(cfg).Create(true, false);
         };
 
         Because of = () =>

src/FluentNHibernate.Testing/DomainModel/Mapping/CompositeIdentityPartTester.cs

@@ -1,5 +1,8 @@
 using System;
+using System.Linq;
 using FluentNHibernate.Mapping;
+using FluentNHibernate.Mapping.Providers;
+using FluentNHibernate.MappingModel.ClassBased;
 using NUnit.Framework;
 
 namespace FluentNHibernate.Testing.DomainModel.Mapping
@@ -160,6 +163,25 @@ public void MixedKeyPropertyAndManyToOneOrdering()
                     .HasName("key-property");
         }
 
+        [Test]
+        public void CompositeIdWithSubclass()
+        {
+            new MappingTester<CompIdTarget>()
+                .SubClassMapping<ComIdSubclass>(s =>
+                {
+                    s.Table("subclasstable");
+                    s.KeyColumn("subclass_longId");
+                    s.KeyColumn("subclass_nullablelongId");
+                })
+                .ForMapping(c => c.CompositeId()
+                    .KeyProperty(x => x.LongId)
+                    .KeyProperty(x => x.NullableLongId))
+                .Element("class/joined-subclass/key/*[1]")
+                    .Exists().HasName("column").HasAttribute("name", "subclass_longId")
+                .RootElement.Element("class/joined-subclass/key/*[2]")
+                    .Exists().HasName("column").HasAttribute("name", "subclass_nullablelongId");
+        }
+
         public class CompIdTarget
         {
             public virtual long LongId { get; set; }
@@ -170,6 +192,11 @@ public class CompIdTarget
             public virtual SomeEnum EnumProperty { get; set; }
         }
 
+        public class ComIdSubclass : CompIdTarget
+        {
+        
+        }
+
         public enum SomeEnum
         {}
 
@@ -183,5 +210,12 @@ public class ComponentKey
             public virtual int KeyCol1 { get; set; }
             public virtual int KeyCol2 { get; set; }
         }
+
+        [Test]
+        public void Can_Have_Multiple_key_Columns()
+        {
+            var provider = (IIndeterminateSubclassMappingProvider)new MultipleKeyColumnsTester.TestMap();
+            provider.GetSubclassMapping(SubclassType.JoinedSubclass).Key.Columns.Count().ShouldEqual(2);
+        }
     }
 }

src/FluentNHibernate.Testing/DomainModel/Mapping/MultipleKeyColumnsTester.cs

@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using FluentNHibernate.Mapping;
+using FluentNHibernate.Mapping.Providers;
+using FluentNHibernate.MappingModel.ClassBased;
+using NUnit.Framework;
+
+namespace FluentNHibernate.Testing.DomainModel.Mapping
+{
+    [TestFixture]
+    public class MultipleKeyColumnsTester
+    {
+        [Test]
+        public void CanHaveMultipleKeyColumns()
+        {
+            var provider = (IIndeterminateSubclassMappingProvider)new TestMap();
+            provider.GetSubclassMapping(SubclassType.JoinedSubclass).Key.Columns.Count().ShouldEqual(2);
+        }
+
+        public class Base
+        {
+            public int Id { get; set; }
+        }
+
+        public class TestMap : SubclassMap<Base>
+        {
+            public TestMap()
+            {
+                KeyColumn("col1");
+                KeyColumn("col2");
+            }
+        }
+    }
+}

src/FluentNHibernate.Testing/FluentNHibernate.Testing.csproj

@@ -124,6 +124,7 @@
     <Compile Include="AutoMapping\Overrides\CompositeIdOverrides.cs" />
     <Compile Include="AutoMapping\Overrides\HibernateMappingOverrides.cs" />
     <Compile Include="DomainModel\Mapping\ManyToManySelfReferencedInverseIntegrationTester.cs" />
+    <Compile Include="DomainModel\Mapping\MultipleKeyColumnsTester.cs" />
     <Compile Include="DomainModel\MemberAccessResolverTests.cs" />
     <Compile Include="DomainModel\MemberBackingFieldTests.cs" />
     <Compile Include="DomainModel\NamingTests.cs" />

src/FluentNHibernate/MappingModel/Collections/AttributeLayeredValues.cs

@@ -1,20 +1,32 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Runtime.Serialization;
 
 namespace FluentNHibernate.MappingModel.Collections
 {
     [Serializable]
-    public class AttributeLayeredValues
+    public class AttributeLayeredValues: ISerializable
     {
-        readonly Dictionary<string, LayeredValues> inner = new Dictionary<string, LayeredValues>();
+        readonly Dictionary<string, LayeredValues> inner;
+
+        public AttributeLayeredValues()
+        {
+            inner = new Dictionary<string, LayeredValues>();
+        }
+        
+        public AttributeLayeredValues(SerializationInfo info, StreamingContext context)
+        {
+            inner = (Dictionary<string, LayeredValues>)info
+                .GetValue("inner", typeof(Dictionary<string, LayeredValues>));
+            inner.OnDeserialization(this);
+        }
 
         public LayeredValues this[string attribute]
         {
             get
             {
                 EnsureValueExists(attribute);
-
                 return inner[attribute];
             }
         }
@@ -83,12 +95,16 @@ public override int GetHashCode()
 
                     pairCode += pair.Key.GetHashCode();
                     pairCode += pair.Value.GetHashCode();
-
                     hashCode += pairCode ^ 367;
                 }
             }
 
             return hashCode;
         }
+
+        public void GetObjectData(SerializationInfo info, StreamingContext context)
+        {
+            info.AddValue("inner", inner);
+        }
     }
 }