Revert "Merge pull request #116 from firo222/master"

This reverts commit 3c48bf8, reversing changes made to dbbdb3f.
nhibernate · Apr 27, 2012 · 3acc7b5 · 3acc7b5
1 parent 3c48bf8
commit 3acc7b5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 49 deletions.
diff --git a/src/FluentNHibernate.Testing/DomainModel/Mapping/CompositeIdentityPartTester.cs b/src/FluentNHibernate.Testing/DomainModel/Mapping/CompositeIdentityPartTester.cs
@@ -159,26 +159,6 @@ public void MixedKeyPropertyAndManyToOneOrdering()
                 .RootElement.Element("class/composite-id/*[2]")
                     .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
         {
@@ -203,10 +183,5 @@ public class ComponentKey
             public virtual int KeyCol1 { get; set; }
             public virtual int KeyCol2 { get; set; }
         }
-
-        public class ComIdSubclass : CompIdTarget
-        {
-
-        }
     }
 }
diff --git a/src/FluentNHibernate/MappingModel/Collections/AttributeLayeredValues.cs b/src/FluentNHibernate/MappingModel/Collections/AttributeLayeredValues.cs
@@ -1,27 +1,14 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Runtime.Serialization;
 
 namespace FluentNHibernate.MappingModel.Collections
 {
     [Serializable]
-    public class AttributeLayeredValues : ISerializable
+    public class AttributeLayeredValues
     {
-        readonly Dictionary<string, LayeredValues> inner;
+        readonly Dictionary<string, LayeredValues> inner = new Dictionary<string, LayeredValues>();
 
-        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
@@ -103,10 +90,5 @@ public override int GetHashCode()
 
             return hashCode;
         }
-
-        public void GetObjectData(SerializationInfo info, StreamingContext context)
-        {
-            info.AddValue("inner", inner);
-        }
     }
 }
diff --git a/src/FluentNHibernate/MappingModel/ColumnMapping.cs b/src/FluentNHibernate/MappingModel/ColumnMapping.cs
@@ -94,14 +94,13 @@ public ColumnMapping Clone()
 
         public bool Equals(ColumnMapping other)
         {
-            return (other != null) &&
-                Equals(other.attributes, attributes) &&
-                Equals(other.Member, Member);
+            return Equals(other.attributes, attributes) && Equals(other.Member, Member);
         }
 
         public override bool Equals(object obj)
         {
-            return Equals(obj as ColumnMapping);
+            if (obj.GetType() != typeof(ColumnMapping)) return false;
+            return Equals((ColumnMapping)obj);
         }
 
         public override int GetHashCode()