Fix property-ref ignoring not-found="exception" mapping

Author: bahusoid

src/NHibernate.Test/Async/NHSpecificTest/NH1001/Fixture.cs

@@ -255,6 +255,20 @@ public async Task Department5IsNullAsync()
 			}
 		}
 
+		[Test]
+		public void Department5IsNotFoundAsync()
+		{
+			var statistics = Sfi.Statistics;
+			statistics.Clear();
+
+			using (var session = OpenSession())
+			using(var transaction = session.BeginTransaction())
+			{
+				ExecuteStatement(session, transaction, $"UPDATE EMPLOYEES SET DEPARTMENT_ID_1 = 11, DEPARTMENT_ID_2 = 12, DEPARTMENT_ID_3 = 13, DEPARTMENT_ID_4 = 24, DEPARTMENT_ID_5 = 99999, ADDRESS_ID = 31 WHERE EMPLOYEE_ID = {employeeId}");
+				Assert.That(() => session.GetAsync<Employee>(employeeId), Throws.InstanceOf<ObjectNotFoundByUniqueKeyException>());
+			}
+		}
+
 		[Test]
 		public async Task AddressNullAsync()
 		{

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

@@ -244,7 +244,7 @@ public void Department5IsNull()
 			}
 		}
 
-		[Test, Ignore("Not fixed yet")]
+		[Test]
 		public void Department5IsNotFound()
 		{
 			var statistics = Sfi.Statistics;
@@ -254,7 +254,7 @@ public void Department5IsNotFound()
 			using(var transaction = session.BeginTransaction())
 			{
 				ExecuteStatement(session, transaction, $"UPDATE EMPLOYEES SET DEPARTMENT_ID_1 = 11, DEPARTMENT_ID_2 = 12, DEPARTMENT_ID_3 = 13, DEPARTMENT_ID_4 = 24, DEPARTMENT_ID_5 = 99999, ADDRESS_ID = 31 WHERE EMPLOYEE_ID = {employeeId}");
-				Assert.That(() => session.Get<Employee>(employeeId), Throws.InstanceOf<ObjectNotFoundException>());
+				Assert.That(() => session.Get<Employee>(employeeId), Throws.InstanceOf<ObjectNotFoundByUniqueKeyException>());
 			}
 		}
 

src/NHibernate/Async/Type/EntityType.cs

@@ -235,6 +235,10 @@ public async Task<object> LoadByUniqueKeyAsync(string entityName, string uniqueK
 				if (result == null)
 				{
 					result = await (persister.LoadByUniqueKeyAsync(uniqueKeyPropertyName, key, session, cancellationToken)).ConfigureAwait(false);
+					if (result == null && !IsNullable)
+					{
+						factory.EntityNotFoundDelegate.HandleEntityNotFound(entityName, uniqueKeyPropertyName, key);
+					}
 				}
 				return result == null ? null : persistenceContext.ProxyFor(result);
 			}

src/NHibernate/Impl/SessionFactoryImpl.cs

@@ -77,7 +77,7 @@ public sealed partial class SessionFactoryImpl : ISessionFactoryImplementor, IOb
 	{
 		#region Default entity not found delegate
 
-		private class DefaultEntityNotFoundDelegate : IEntityNotFoundDelegate
+		internal class DefaultEntityNotFoundDelegate : IEntityNotFoundDelegate
 		{
 			#region IEntityNotFoundDelegate Members
 
@@ -86,6 +86,11 @@ public void HandleEntityNotFound(string entityName, object id)
 				throw new ObjectNotFoundException(id, entityName);
 			}
 
+			public void HandleEntityNotFound(string entityName, string propertyName, object key)
+			{
+				throw new ObjectNotFoundByUniqueKeyException(entityName, propertyName, key);
+			}
+
 			#endregion
 		}
 

src/NHibernate/ObjectNotFoundByUniqueKeyException.cs

@@ -0,0 +1,56 @@
+using System;
+using System.Runtime.Serialization;
+using System.Security;
+using NHibernate.Impl;
+
+namespace NHibernate
+{
+	/// <summary>
+	/// Thrown when entity can't be found by given unique key
+	/// </summary>
+	[Serializable]
+	public class ObjectNotFoundByUniqueKeyException : HibernateException
+	{
+		/// <summary>
+		/// Property name
+		/// </summary>
+		public string PropertyName { get; }
+
+		/// <summary>
+		/// Key
+		/// </summary>
+		public object Key { get; }
+
+		/// <summary>
+		/// Thrown when entity can't be found by given unique key
+		/// </summary>
+		/// <param name="entityName">Entity name</param>
+		/// <param name="propertyName">Property name</param>
+		/// <param name="key">Key</param>
+		public ObjectNotFoundByUniqueKeyException(string entityName, string propertyName, object key)
+			: base("No row with given unique key found " + MessageHelper.InfoString(entityName, propertyName, key))
+		{
+			Key = key;
+			PropertyName = propertyName;
+		}
+
+		#region Serialization
+
+		protected ObjectNotFoundByUniqueKeyException(SerializationInfo info, StreamingContext context)
+			: base(info, context)
+		{
+			Key = info.GetValue(nameof(Key), typeof(object));
+			PropertyName = info.GetString(nameof(PropertyName));
+		}
+
+		[SecurityCritical]
+		public override void GetObjectData(SerializationInfo info, StreamingContext context)
+		{
+			base.GetObjectData(info, context);
+			info.AddValue(nameof(Key), Key);
+			info.AddValue(nameof(PropertyName), PropertyName);
+		}
+
+		#endregion Serialization
+	}
+}

src/NHibernate/Proxy/IEntityNotFoundDelegate.cs

@@ -1,5 +1,31 @@
 namespace NHibernate.Proxy
 {
+	//6.0 TODO Add to IEntityNotFoundDelegate interface
+	internal static class EntityNotFoundDelegateExtension
+	{
+		/// <summary>
+		/// Method to handle the scenario of an entity not found by unique key.
+		/// </summary>
+		/// <param name="interceptor"></param>
+		/// <param name="entityName">The entityName (may be the class fullname)</param>
+		/// <param name="propertyName">Property name</param>
+		/// <param name="key">Key</param>
+		public static void HandleEntityNotFound(
+			this IEntityNotFoundDelegate interceptor,
+			string entityName,
+			string propertyName,
+			object key)
+		{
+			if (interceptor is Impl.SessionFactoryImpl.DefaultEntityNotFoundDelegate x)
+			{
+				x.HandleEntityNotFound(entityName, propertyName, key);
+				return;
+			}
+
+			new Impl.SessionFactoryImpl.DefaultEntityNotFoundDelegate().HandleEntityNotFound(entityName, propertyName, key);
+		}
+	}
+
 	/// <summary> 
 	/// Delegate to handle the scenario of an entity not found by a specified id. 
 	/// </summary>

src/NHibernate/Type/EntityType.cs

@@ -291,6 +291,10 @@ public bool IsUniqueKeyReference
 			get { return uniqueKeyPropertyName != null; }
 		}
 
+		/// <summary>
+		/// True if not null entity key can represent null entity
+		/// (e.g. entity mapped with not-found="ignore" or not constrained one-to-one mapping)
+		/// </summary>
 		public abstract bool IsNullable { get; }
 
 		/// <summary> Retrieves the {@link Joinable} defining the associated entity. </summary>
@@ -530,6 +534,10 @@ public object LoadByUniqueKey(string entityName, string uniqueKeyPropertyName, o
 				if (result == null)
 				{
 					result = persister.LoadByUniqueKey(uniqueKeyPropertyName, key, session);
+					if (result == null && !IsNullable)
+					{
+						factory.EntityNotFoundDelegate.HandleEntityNotFound(entityName, uniqueKeyPropertyName, key);
+					}
 				}
 				return result == null ? null : persistenceContext.ProxyFor(result);
 			}

src/NHibernate/Type/ManyToOneType.cs

@@ -236,7 +236,7 @@ public override bool IsDirty(object old, object current, bool[] checkable, ISess
 			return IsDirtyManyToOne(old, current, IsAlwaysDirtyChecked ? null : checkable, session);
 		}
 
-
+		/// <inheritdoc />
 		public override bool IsNullable
 		{
 			get { return ignoreNotFound; }

src/NHibernate/Type/OneToOneType.cs

@@ -122,6 +122,7 @@ public override object Hydrate(DbDataReader rs, string[] names, ISessionImplemen
 			return identifier;
 		}
 
+		/// <inheritdoc />
 		public override bool IsNullable
 		{
 			get { return foreignKeyDirection.Equals(ForeignKeyDirection.ForeignKeyToParent); }