NH-3468 - Fix delete of entity with lazy uninitialized component

Author: hazzik

src/NHibernate.Test/LazyComponentTest/Address.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace NHibernate.Test.LazyComponentTest
+{
+	public class Address
+	{
+		public virtual string Country { get; set; }
+		public virtual string City { get; set; }
+	}
+}

src/NHibernate.Test/LazyComponentTest/LazyComponentTestFixture.cs

@@ -0,0 +1,101 @@
+using System.Collections;
+using NUnit.Framework;
+
+namespace NHibernate.Test.LazyComponentTest
+{
+	[TestFixture]
+	public class LazyComponentTestFixture : TestCase
+	{
+		protected override IList Mappings
+		{
+			get { return new[] {"LazyComponentTest.Person.hbm.xml"}; }
+		}
+
+		protected override string MappingsAssembly
+		{
+			get { return "NHibernate.Test"; }
+		}
+
+		protected override void OnSetUp()
+		{
+			using (var s = OpenSession())
+			using (var t = s.BeginTransaction())
+			{
+				var person = new Person
+				{
+					Name = "Gabor",
+					Address = new Address
+					{
+						Country = "HUN",
+						City = "Budapest"
+					}
+				};
+				s.Persist(person);
+				t.Commit();
+			}
+		}
+
+		protected override void OnTearDown()
+		{
+			using (var s = OpenSession())
+			using (var t = s.BeginTransaction())
+			{
+				s.CreateQuery("delete from Person").ExecuteUpdate();
+				t.Commit();
+			}
+		}
+
+		[Test]
+		public void LazyLoadTest()
+		{
+			using (var s = OpenSession())
+			using (var t = s.BeginTransaction())
+			{
+				var p = s.CreateQuery("from Person p where name='Gabor'").UniqueResult<Person>();
+				// make sure component has not been initialized yet
+				Assert.That(NHibernateUtil.IsPropertyInitialized(p, "Address"), Is.False);
+
+				t.Commit();
+			}
+		}
+
+		[Test]
+		public void LazyDeleteTest()
+		{
+			using (var s = OpenSession())
+			using (var t = s.BeginTransaction())
+			{
+				var p = s.CreateQuery("from Person p where name='Gabor'").UniqueResult<Person>();
+				// make sure component has not been initialized yet
+				Assert.That(NHibernateUtil.IsPropertyInitialized(p, "Address"), Is.False);
+				s.Delete(p);
+				t.Commit();
+			}
+		}
+
+		[Test]
+		public void LazyUpdateTest()
+		{
+			using (var s = OpenSession())
+			using (var t = s.BeginTransaction())
+			{
+				var p = s.CreateQuery("from Person p where name='Gabor'").UniqueResult<Person>();
+				// make sure component has not been initialized yet
+				Assert.That(!NHibernateUtil.IsPropertyInitialized(p, "Address"));
+
+				p.Address.City = "Baja";
+				s.Update(p);
+
+				t.Commit();
+			}
+			using (var s = OpenSession())
+			using (var t = s.BeginTransaction())
+			{
+				var p = s.CreateQuery("from Person p where name='Gabor'").UniqueResult<Person>();
+				Assert.That(p.Address.City, Is.EqualTo("Baja"));
+
+				t.Commit();
+			}
+		}
+	}
+}

src/NHibernate.Test/LazyComponentTest/Person.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace NHibernate.Test.LazyComponentTest
+{
+	public class Person
+	{
+		public virtual string Name { get; set; }
+		public virtual Address Address { get; set; }
+	}
+}

src/NHibernate.Test/LazyComponentTest/Person.hbm.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2"
+				   assembly="NHibernate.Test"
+				   namespace="NHibernate.Test.LazyComponentTest">
+
+  <class name="Person">
+    <id name="Name"/>
+    <component name="Address" lazy="true">
+      <property name="Country" />
+      <property name="City" />
+    </component>
+  </class>
+
+</hibernate-mapping>

src/NHibernate.Test/NHibernate.Test.csproj

@@ -497,6 +497,9 @@
     <Compile Include="KnownBugAttribute.cs" />
     <Compile Include="Join\JoinedFilters.cs" />
     <Compile Include="Join\TennisPlayer.cs" />
+    <Compile Include="LazyComponentTest\Address.cs" />
+    <Compile Include="LazyComponentTest\LazyComponentTestFixture.cs" />
+    <Compile Include="LazyComponentTest\Person.cs" />
     <Compile Include="LazyOneToOne\Employee.cs" />
     <Compile Include="LazyOneToOne\Employment.cs" />
     <Compile Include="LazyOneToOne\LazyOneToOneTest.cs" />
@@ -3062,6 +3065,7 @@
     <EmbeddedResource Include="NHSpecificTest\NH1291AnonExample\Mappings.hbm.xml" />
   </ItemGroup>
   <ItemGroup>
+    <EmbeddedResource Include="LazyComponentTest\Person.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH3570\Mappings.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH3455\Mappings.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH3590\Mappings.hbm.xml" />

src/NHibernate/Tuple/Component/PocoComponentTuplizer.cs

@@ -1,5 +1,6 @@
 using System;
 using NHibernate.Bytecode;
+using NHibernate.Intercept;
 using NHibernate.Properties;
 
 namespace NHibernate.Tuple.Component
@@ -67,7 +68,7 @@ public override System.Type MappedClass
 		public override object[] GetPropertyValues(object component)
 		{
 			// NH Different behavior : for NH-1101
-			if (Equals(BackrefPropertyAccessor.Unknown, component) || component == null)
+			if (Equals(BackrefPropertyAccessor.Unknown, component) || Equals(LazyPropertyInitializer.UnfetchedProperty, component) || component == null)
 			{
 				return new object[propertySpan];
 			}