NH-3049 - Fix mapping to fields

Author: hazzik

src/NHibernate.Test/App.config

@@ -103,5 +103,13 @@
 	</log4net>
 
 <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup>
+	<runtime>
+		<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+			<dependentAssembly>
+				<assemblyIdentity name="nunit.framework" publicKeyToken="96d09a1eb7f44a77" culture="neutral"/>
+				<bindingRedirect oldVersion="0.0.0.0-2.6.1.12217" newVersion="2.6.1.12217"/>
+			</dependentAssembly>
+		</assemblyBinding>
+	</runtime>
 
 </configuration>

src/NHibernate.Test/MappingByCode/ExplicitMappingTests/MappingOfInternalMembersOnRootEntity.cs

@@ -0,0 +1,57 @@
+using System.Linq;
+using NHibernate.Cfg.MappingSchema;
+using NHibernate.Mapping.ByCode;
+using NUnit.Framework;
+
+namespace NHibernate.Test.MappingByCode.ExplicitMappingTests
+{
+	[TestFixture]
+	public class MappingOfInternalMembersOnRootEntity
+	{
+		public class MyClass
+		{
+			protected internal int _id;
+			protected internal int _version;
+			protected internal string _something;
+		}
+
+		[Test]
+		public void MapClassWithInternalIdAndProperty()
+		{
+			var mapper = new ModelMapper();
+			mapper.Class<MyClass>(ca =>
+			{
+				ca.Id(x => x._id, map =>
+				{
+					map.Column("MyClassId");
+					map.Generator(Generators.HighLow, gmap => gmap.Params(new { max_low = 100 }));
+				});
+				ca.Version(x => x._version, map => { });
+				ca.Property(x => x._something, map => map.Length(150));
+			});
+			var hbmMapping = mapper.CompileMappingFor(new[] { typeof(MyClass) });
+			var hbmClass = hbmMapping.RootClasses[0];
+			Assert.That(hbmClass, Is.Not.Null);
+
+			var hbmId = hbmClass.Id;
+			Assert.That(hbmId, Is.Not.Null);
+			Assert.That(hbmId.name, Is.EqualTo("_id"));
+			Assert.That(hbmId.access, Is.EqualTo("field"));
+
+			var hbmIdGenerator = hbmId.generator;
+			Assert.That(hbmIdGenerator, Is.Not.Null);
+			Assert.That(hbmIdGenerator.@class, Is.EqualTo("hilo"));
+			Assert.That(hbmIdGenerator.param[0].name, Is.EqualTo("max_low"));
+			Assert.That(hbmIdGenerator.param[0].GetText(), Is.EqualTo("100"));
+
+			var hbmVersion = hbmClass.Version;
+			Assert.That(hbmVersion, Is.Not.Null);
+			Assert.That(hbmVersion.name, Is.EqualTo("_version"));
+
+			var hbmProperty = hbmClass.Properties.OfType<HbmProperty>().Single();
+			Assert.That(hbmProperty.name, Is.EqualTo("_something"));
+			Assert.That(hbmProperty.access, Is.EqualTo("field"));
+			Assert.That(hbmProperty.length, Is.EqualTo("150"));
+		}
+	}
+}

src/NHibernate.Test/NHibernate.Test.csproj

@@ -582,6 +582,7 @@
     <Compile Include="MappingByCode\ExplicitMappingTests\ConformistMappingRegistrationTests\UnionSubclassMappingRegistrationTest.cs" />
     <Compile Include="MappingByCode\ExplicitMappingTests\DynamicComponentMappingTests.cs" />
     <Compile Include="MappingByCode\ExplicitMappingTests\IdBagMappingTest.cs" />
+    <Compile Include="MappingByCode\ExplicitMappingTests\MappingOfInternalMembersOnRootEntity.cs" />
     <Compile Include="MappingByCode\ExplicitMappingTests\MappingOfPrivateMembersOnRootEntity.cs" />
     <Compile Include="MappingByCode\ExplicitMappingTests\NaturalIdTests.cs" />
     <Compile Include="MappingByCode\ExplicitMappingTests\NestedComponetsTests.cs" />

src/NHibernate/Mapping/ByCode/TypeExtensions.cs

@@ -100,8 +100,16 @@ public static MemberInfo DecodeMemberAccessExpressionOf<TEntity, TProperty>(Expr
 				return memberOfDeclaringType;
 			}
 
-			return typeof (TEntity).GetProperty(memberOfDeclaringType.Name, PropertiesOfClassHierarchy,
-			                                    null, memberOfDeclaringType.GetPropertyOrFieldType(), new System.Type[0], null);
+			var propertyInfo = memberOfDeclaringType as PropertyInfo;
+			if (propertyInfo != null)
+			{
+				return typeof (TEntity).GetProperty(propertyInfo.Name, PropertiesOfClassHierarchy, null, propertyInfo.PropertyType, new System.Type[0], null);
+			}
+			if (memberOfDeclaringType is FieldInfo)
+			{
+				return typeof (TEntity).GetField(memberOfDeclaringType.Name, PropertiesOfClassHierarchy);
+			}
+			throw new NotSupportedException();
 		}
 
 		public static MemberInfo GetMemberFromDeclaringType(this MemberInfo source)