Merge pull request #608 from hazzik/NH-3755

NH-3755 - Fix overrides of members with the same names

Author: hazzik

src/NHibernate.Test/NHSpecificTest/NH3755/Circle.cs

@@ -0,0 +1,10 @@
+using System;
+
+namespace NHibernate.Test.NHSpecificTest.NH3755
+{
+	public class Circle : Shape, ICircle
+	{
+		public override string Property2 { get; set; }
+		public virtual string Property3 { get; set; }
+	}
+}

src/NHibernate.Test/NHSpecificTest/NH3755/Fixture.cs

@@ -0,0 +1,72 @@
+using System.Linq;
+using NHibernate.Linq;
+using NUnit.Framework;
+
+namespace NHibernate.Test.NHSpecificTest.NH3755
+{
+	[TestFixture]
+	public class Fixture : BugTestCase
+	{
+		protected override void OnSetUp()
+		{
+			using (var session = OpenSession())
+			using (var transaction = session.BeginTransaction())
+			{
+				var c = new Circle {Property1 = "Circle1", Property2 = "Circle2", Property3 = "Circle3"};
+				session.Save(c);
+
+				var s = new Square {Property1 = "Square1", Property2 = "Square2", Property3 = "Square3"};
+				session.Save(c);
+				session.Save(s);
+
+				var sc1 = new ShapeContainer {Name = "Circle", Shape = c};
+				var sc2 = new ShapeContainer {Name = "Square", Shape = s};
+
+				session.Save(sc1);
+				session.Save(sc2);
+
+				session.Flush();
+				transaction.Commit();
+			}
+		}
+
+		protected override void OnTearDown()
+		{
+			using (var session = OpenSession())
+			using (var transaction = session.BeginTransaction())
+			{
+				session.Delete("from System.Object");
+
+				session.Flush();
+				transaction.Commit();
+			}
+		}
+
+		[Test]
+		public void TestCompositeProxy()
+		{
+			using (var session = OpenSession())
+			using (session.BeginTransaction())
+			{
+				var result1 = (from e in session.Query<ShapeContainer>()
+				               where e.Name == "Circle"
+				               select e).ToList();
+
+				var result2 = (from e in session.Query<ShapeContainer>()
+				               where e.Name == "Square"
+				               select e).ToList();
+
+				var circle = (ICircle) result1[0].Shape;
+				var square = (ISquare) result2[0].Shape;
+
+				Assert.That(circle.Property1, Is.Not.Null);
+				Assert.That(circle.Property2, Is.Not.Null);
+				Assert.That(circle.Property3, Is.Not.Null);
+
+				Assert.That(square.Property1, Is.Not.Null);
+				Assert.That(square.Property2, Is.Not.Null);
+				Assert.That(square.Property3, Is.Not.Null);
+			}
+		}
+	}
+}

src/NHibernate.Test/NHSpecificTest/NH3755/ICircle.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace NHibernate.Test.NHSpecificTest.NH3755
+{
+	public interface ICircle : IShape
+	{
+		string Property2 { get; set; }
+		string Property3 { get; set; }
+	}
+}

src/NHibernate.Test/NHSpecificTest/NH3755/IShape.cs

@@ -0,0 +1,10 @@
+using System;
+
+namespace NHibernate.Test.NHSpecificTest.NH3755
+{
+	public interface IShape
+	{
+		Guid Id { get; set; }
+		string Property1 { get; set; }
+	}
+}

src/NHibernate.Test/NHSpecificTest/NH3755/IShapeContainer.cs

@@ -0,0 +1,11 @@
+using System;
+
+namespace NHibernate.Test.NHSpecificTest.NH3755
+{
+	public interface IShapeContainer
+	{
+		Guid Id { get; set; }
+		string Name { get; set; }
+		IShape Shape { get; set; }
+	}
+}

src/NHibernate.Test/NHSpecificTest/NH3755/ISquare.cs

@@ -0,0 +1,8 @@
+namespace NHibernate.Test.NHSpecificTest.NH3755
+{
+	public interface ISquare : IShape
+	{
+		string Property2 { get; set; }
+		string Property3 { get; set; }
+	}
+}

src/NHibernate.Test/NHSpecificTest/NH3755/Mappings.hbm.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" default-lazy="true" assembly="NHibernate.Test" namespace="NHibernate.Test.NHSpecificTest.NH3755">
+
+	<class name="Shape" proxy="IShape">
+    <id name="Id">
+      <generator class="guid.comb" />
+    </id> 
+		<property name="Property1" />
+	</class>
+
+  <joined-subclass proxy="ISquare" extends="Shape" name="Square">
+    <key column="ShapeId" />
+    <property name="Property2"/>
+    <property name="Property3"/>
+  </joined-subclass>
+
+  <joined-subclass proxy="ICircle" extends="Shape" name="Circle">
+    <key column="ShapeId" />
+    <property name="Property2"/>
+    <property name="Property3"/>
+  </joined-subclass>
+  
+  <class name="ShapeContainer" proxy="IShapeContainer">
+    <id name="Id">
+      <generator class="guid.comb" />
+    </id>
+    <property name="Name" />
+    <many-to-one name="Shape" class="Shape" />
+  </class>
+  
+  
+
+
+</hibernate-mapping>

src/NHibernate.Test/NHSpecificTest/NH3755/Shape.cs

@@ -0,0 +1,11 @@
+using System;
+
+namespace NHibernate.Test.NHSpecificTest.NH3755
+{
+	public abstract class Shape : IShape
+	{
+		public virtual Guid Id { get; set; }
+		public string Property1 { get; set; }
+		public abstract string Property2 { get; set; }
+	}
+}

src/NHibernate.Test/NHSpecificTest/NH3755/ShapeContainer.cs

@@ -0,0 +1,11 @@
+using System;
+
+namespace NHibernate.Test.NHSpecificTest.NH3755
+{
+	public class ShapeContainer : IShapeContainer
+	{
+		public Guid Id { get; set; }
+		public string Name { get; set; }
+		public IShape Shape { get; set; }
+	}
+}

src/NHibernate.Test/NHSpecificTest/NH3755/Square.cs

@@ -0,0 +1,10 @@
+using System;
+
+namespace NHibernate.Test.NHSpecificTest.NH3755
+{
+	public class Square : Shape, ISquare
+	{
+		public override string Property2 { get; set; }
+		public virtual string Property3 { get; set; }
+	}
+}

src/NHibernate.Test/NHibernate.Test.csproj

@@ -975,6 +975,15 @@
     <Compile Include="NHSpecificTest\NH3909\FixtureByCode.cs" />
     <Compile Include="NHSpecificTest\NH3957\ResultTransformerEqualityFixture.cs" />
     <Compile Include="NHSpecificTest\NH3956\Fixture.cs" />
+    <Compile Include="NHSpecificTest\NH3755\Circle.cs" />
+    <Compile Include="NHSpecificTest\NH3755\Fixture.cs" />
+    <Compile Include="NHSpecificTest\NH3755\ICircle.cs" />
+    <Compile Include="NHSpecificTest\NH3755\IShape.cs" />
+    <Compile Include="NHSpecificTest\NH3755\IShapeContainer.cs" />
+    <Compile Include="NHSpecificTest\NH3755\ISquare.cs" />
+    <Compile Include="NHSpecificTest\NH3755\Shape.cs" />
+    <Compile Include="NHSpecificTest\NH3755\ShapeContainer.cs" />
+    <Compile Include="NHSpecificTest\NH3755\Square.cs" />
     <Compile Include="NHSpecificTest\NH646\Domain.cs" />
     <Compile Include="NHSpecificTest\NH646\Fixture.cs" />
     <Compile Include="NHSpecificTest\NH3234\Fixture.cs" />
@@ -3291,6 +3300,7 @@
       <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="NHSpecificTest\NH3757\Mappings.hbm.xml" />
+    <EmbeddedResource Include="NHSpecificTest\NH3755\Mappings.hbm.xml" />
     <EmbeddedResource Include="LazyComponentTest\Person.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH3372\Mappings.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH3567\Mappings.hbm.xml" />

src/NHibernate/Proxy/DynamicProxy/DefaultProxyMethodBuilder.cs

@@ -141,6 +141,8 @@ public void CreateProxiedMethod(FieldInfo field, MethodInfo method, TypeBuilder
 			var proxyMethod = GenerateMethodSignature(method.Name, method, typeBuilder);
 
 			MethodBodyEmitter.EmitMethodBody(proxyMethod, callbackMethod, method, field);
+
+			typeBuilder.DefineMethodOverride(proxyMethod, method);
 		}
 	}
 }