Fix usage of parent class properties in ComponentAsId (NH-3105)

Author: EamonHetherton

src/NHibernate.Test/MappingByCode/IntegrationTests/NH3105/Fixture.cs

@@ -0,0 +1,69 @@
+using System.Linq;
+using NHibernate.Cfg.MappingSchema;
+using NHibernate.Mapping.ByCode;
+using NUnit.Framework;
+
+namespace NHibernate.Test.MappingByCode.IntegrationTests.NH3105
+{
+	[TestFixture]
+	public class Fixture
+	{
+		[Test]
+		public void CanMapComponentAsIdWhenComnponentIsDeclaredInBaseClass()
+		{
+			var mapper = new ModelMapper();
+			mapper.Class<Entity>(rc =>
+			{
+				rc.ComponentAsId(x => x.ComponentId, m => m.Property(c => c.Id, pm => pm.Column("IdColumn")));
+			});
+
+			var mapping = mapper.CompileMappingForAllExplicitlyAddedEntities();
+
+			var entity = mapping.RootClasses[0];
+			var componentId = entity.CompositeId;
+			Assert.That(componentId, Is.Not.Null);
+
+			var key = componentId.Items[0] as HbmKeyProperty;
+			Assert.That(key.Columns.Single().name, Is.EqualTo("IdColumn"));
+		}
+
+
+		[Test]
+		public void CanMapIdWhenIdIsDeclaredInBaseClass()
+		{
+			var mapper = new ModelMapper();
+			mapper.Class<Entity>(rc =>
+			{
+				rc.Id(x => x.Id, m => m.Column("IdColumn"));
+			});
+
+			var mapping = mapper.CompileMappingForAllExplicitlyAddedEntities();
+
+			var entity = mapping.RootClasses[0];
+			var componentId = entity.CompositeId;
+			Assert.That(componentId, Is.Null);
+
+			var id = entity.Id;
+			Assert.That(id, Is.Not.Null);
+		}
+
+		[Test]
+		public void CanMapComponentAsIdWhenComnponentIsDeclaredInClass()
+		{
+			var mapper = new ModelMapper();
+			mapper.Class<EntityBase>(rc =>
+			{
+				rc.ComponentAsId(x => x.ComponentId, m => m.Property(c => c.Id, pm => pm.Column("IdColumn")));
+			});
+
+			var mapping = mapper.CompileMappingForAllExplicitlyAddedEntities();
+
+			var entity = mapping.RootClasses[0];
+			var componentId = entity.CompositeId;
+			Assert.That(componentId, Is.Not.Null);
+
+			var key = componentId.Items[0] as HbmKeyProperty;
+			Assert.That(key.Columns.Single().name, Is.EqualTo("IdColumn"));
+		}
+	}
+}

src/NHibernate.Test/MappingByCode/IntegrationTests/NH3105/Model.cs

@@ -0,0 +1,20 @@
+using System;
+
+namespace NHibernate.Test.MappingByCode.IntegrationTests.NH3105
+{
+	class EntityBase
+	{
+		public virtual EntityId ComponentId { get; set; }
+		public virtual Guid Id { get; set; }
+	}
+	
+	class Entity : EntityBase
+	{
+		public virtual string Name { get; set; }
+	}
+
+	class EntityId
+	{
+		public virtual Guid Id { get; set; }
+	}
+}

src/NHibernate.Test/NHibernate.Test.csproj

@@ -1006,6 +1006,8 @@
     <Compile Include="NHSpecificTest\NH3138\FixtureByCode.cs" />
     <Compile Include="NHSpecificTest\NH3153\Model.cs" />
     <Compile Include="NHSpecificTest\NH3153\Fixture.cs" />
+    <Compile Include="MappingByCode\IntegrationTests\NH3105\Model.cs" />
+    <Compile Include="MappingByCode\IntegrationTests\NH3105\Fixture.cs" />
     <Compile Include="NHSpecificTest\NH941\Domain.cs" />
     <Compile Include="NHSpecificTest\NH941\Fixture.cs" />
     <Compile Include="NHSpecificTest\NH941\FixtureUsingList.cs" />

src/NHibernate/Mapping/ByCode/Impl/DefaultCandidatePersistentMembersProvider.cs

@@ -18,7 +18,7 @@ public IEnumerable<MemberInfo> GetEntityMembersForPoid(System.Type entityClass)
 		{
 			return entityClass.IsInterface
 			       	? entityClass.GetInterfaceProperties()
-			       	: entityClass.GetProperties(RootClassPropertiesBindingFlags).Concat(GetFieldsOfHierarchy(entityClass));
+					: entityClass.GetPropertiesOfHierarchy().Concat(GetFieldsOfHierarchy(entityClass));
 		}
 
 		public IEnumerable<MemberInfo> GetRootEntityMembers(System.Type entityClass)

src/NHibernate/Mapping/ByCode/TypeExtensions.cs

@@ -546,7 +546,7 @@ private static IEnumerable<MemberInfo> GetPropertiesOfInterfacesImplemented(this
 			}
 		}
 
-		private static IEnumerable<MemberInfo> GetPropertiesOfHierarchy(this System.Type type)
+		internal static IEnumerable<MemberInfo> GetPropertiesOfHierarchy(this System.Type type)
 		{
 			if(type.IsInterface)
 			{