Merge branch 'ngbrown-NH-3604'

Author: oskarb

src/NHibernate.Test/NHSpecificTest/NH3604/Entity.cs

@@ -0,0 +1,39 @@
+using System;
+using System.Linq.Expressions;
+
+namespace NHibernate.Test.NHSpecificTest.NH3604
+{
+	public class Entity
+	{
+		protected virtual Guid Id { get; set; }
+		public virtual string Name { get; set; }
+		public virtual EntityDetail Detail { get; set; }
+
+		public static class PropertyAccessExpressions
+		{
+			public static readonly Expression<Func<Entity, Guid>> Id = x => x.Id;
+		}
+	}
+
+	public class EntityDetail
+	{
+		// Required by NHibernate
+		protected EntityDetail()
+		{
+		}
+
+		public EntityDetail(Entity entity)
+		{
+			this.Entity = entity;
+		}
+
+		public virtual Guid Id { get; set; }
+		protected virtual Entity Entity { get; set; }
+		public virtual string ExtraInfo { get; set; }
+
+		public static class PropertyAccessExpressions
+		{
+			public static readonly Expression<Func<EntityDetail, Entity>> Entity = x => x.Entity;
+		}
+	}
+}

src/NHibernate.Test/NHSpecificTest/NH3604/FixtureByCode.cs

@@ -0,0 +1,94 @@
+using System.Linq;
+using NHibernate.Cfg.MappingSchema;
+using NHibernate.Linq;
+using NHibernate.Mapping.ByCode;
+using NUnit.Framework;
+
+namespace NHibernate.Test.NHSpecificTest.NH3604
+{
+	/// <summary>
+	/// Tests ability to map a non-public property by code via expressions to access the hidden properties
+	/// </summary>
+	public class ByCodeFixture : TestCaseMappingByCode
+	{
+		protected override HbmMapping GetMappings()
+		{
+			var mapper = new ModelMapper();
+			mapper.Class<Entity>(rc =>
+			{
+				rc.Id(Entity.PropertyAccessExpressions.Id, m => m.Generator(Generators.GuidComb));
+				rc.Property(x => x.Name);
+				rc.OneToOne(x => x.Detail, m => m.Cascade(Mapping.ByCode.Cascade.All));
+			});
+
+			mapper.Class<EntityDetail>(rc =>
+			{
+				rc.Id(x => x.Id, m => m.Generator(new ForeignGeneratorDef(ReflectionHelper.GetProperty(EntityDetail.PropertyAccessExpressions.Entity))));
+				rc.OneToOne(EntityDetail.PropertyAccessExpressions.Entity, m => m.Constrained(true));
+				rc.Property(x => x.ExtraInfo);
+			});
+
+			return mapper.CompileMappingForAllExplicitlyAddedEntities();
+		}
+
+		protected override void OnSetUp()
+		{
+			using (ISession session = OpenSession())
+			using (ITransaction transaction = session.BeginTransaction())
+			{
+				var e1 = new Entity { Name = "Bob" };
+				session.Save(e1);
+
+
+				var e2 = new Entity { Name = "Sally" };
+				var ed2 = new EntityDetail(e2) { ExtraInfo = "Jo" };
+				e2.Detail = ed2;
+
+				session.Save(e2);
+
+				session.Flush();
+				transaction.Commit();
+			}
+		}
+
+		protected override void OnTearDown()
+		{
+			using (ISession session = OpenSession())
+			using (ITransaction transaction = session.BeginTransaction())
+			{
+				session.Delete("from System.Object");
+
+				session.Flush();
+				transaction.Commit();
+			}
+		}
+
+		[Test]
+		public void CanPerformQueryOnMappedClassWithProtectedProperty()
+		{
+			using (ISession session = OpenSession())
+			using (session.BeginTransaction())
+			{
+				var result = from e in session.Query<Entity>()
+							 where e.Name == "Sally"
+							 select e;
+
+				var entities = result.ToList();
+				Assert.AreEqual(1, entities.Count);
+				Assert.AreEqual("Jo", entities[0].Detail.ExtraInfo);
+			}
+		}
+
+		[Test]
+		public void CanWriteMappingsReferencingProtectedProperty()
+		{
+			var mapper = new ModelMapper();
+			mapper.Class<Entity>(rc =>
+			{
+				rc.Id(Entity.PropertyAccessExpressions.Id, m => m.Generator(Generators.GuidComb));
+				rc.Property(x => x.Name);
+			});
+			mapper.CompileMappingForEachExplicitlyAddedEntity().WriteAllXmlMapping();
+		}
+	}
+}

src/NHibernate.Test/NHibernate.Test.csproj

@@ -792,6 +792,8 @@
     </Compile>
     <Compile Include="NHSpecificTest\NH3202\Domain.cs" />
     <Compile Include="NHSpecificTest\NH3202\Fixture.cs" />
+    <Compile Include="NHSpecificTest\NH3604\Entity.cs" />
+    <Compile Include="NHSpecificTest\NH3604\FixtureByCode.cs" />
     <Compile Include="NHSpecificTest\NH646\Domain.cs" />
     <Compile Include="NHSpecificTest\NH646\Fixture.cs" />
     <Compile Include="NHSpecificTest\NH3234\Fixture.cs" />

src/NHibernate/Mapping/ByCode/TypeExtensions.cs

@@ -100,7 +100,8 @@ public static MemberInfo DecodeMemberAccessExpressionOf<TEntity, TProperty>(Expr
 				return memberOfDeclaringType;
 			}
 
-			return typeof (TEntity).GetProperty(memberOfDeclaringType.Name, memberOfDeclaringType.GetPropertyOrFieldType());
+			return typeof (TEntity).GetProperty(memberOfDeclaringType.Name, PropertiesOfClassHierarchy,
+			                                    null, memberOfDeclaringType.GetPropertyOrFieldType(), new System.Type[0], null);
 		}
 
 		public static MemberInfo GetMemberFromDeclaringType(this MemberInfo source)