Generate async files

Author: github-actions[bot]

src/NHibernate.Test/Async/FetchLazyProperties/FetchLazyPropertiesFixture.cs

@@ -1087,6 +1087,41 @@ void AssertPersons(List<Person> results, bool fetched)
 			}
 		}
 
+		[Test]
+		public async Task TestRefreshRemovesLazyLoadedPropertiesAsync()
+		{
+			using (var outerSession = OpenSession())
+			{
+				const string query = "from Person fetch Image where Id = 1";
+				const string namePostFix = "_MODIFIED";
+				const int imageLength = 4711;
+				
+				Person outerPerson = await (outerSession.CreateQuery(query).UniqueResultAsync<Person>());
+				
+				Assert.That(outerPerson.Name.EndsWith(namePostFix), Is.False); // Normal property 
+				Assert.That(outerPerson.Image.Length, Is.EqualTo(1)); // Lazy Property
+				
+				// Changing the properties of the person in a different sessions
+				using (var innerSession = OpenSession())
+				{
+					var transaction = innerSession.BeginTransaction();
+				
+					Person innerPerson = await (innerSession.CreateQuery(query).UniqueResultAsync<Person>());
+					innerPerson.Image = new byte[imageLength];
+					innerPerson.Name += namePostFix;
+					await (innerSession.UpdateAsync(innerPerson));
+					
+					await (transaction.CommitAsync());
+				}
+				
+				// Refreshing the person in the outer session
+				await (outerSession.RefreshAsync(outerPerson));
+				
+				Assert.That(outerPerson.Name.EndsWith(namePostFix), Is.True); // Value has changed
+				Assert.That(outerPerson.Image.Length, Is.EqualTo(imageLength)); // This is still the old value
+			}
+		}
+		
 		private static Person GeneratePerson(int i, Person bestFriend)
 		{
 			return new Person

src/NHibernate/Async/Loader/Loader.cs

@@ -757,7 +757,8 @@ private async Task<object> InstanceNotYetLoadedAsync(DbDataReader dr, int i, ILo
 
 			ILoadable concretePersister = await (GetConcretePersisterAsync(dr, i, persister, key.Identifier, session, cancellationToken)).ConfigureAwait(false);
 
-			if (optionalObjectKey != null && key.Equals(optionalObjectKey))
+			bool useOptionalObject = optionalObjectKey != null && key.Equals(optionalObjectKey);
+			if (useOptionalObject)
 			{
 				// its the given optional object
 				obj = optionalObject;
@@ -773,8 +774,8 @@ private async Task<object> InstanceNotYetLoadedAsync(DbDataReader dr, int i, ILo
 			// (but don't yet initialize the object itself)
 			// note that we acquired LockMode.READ even if it was not requested
 			LockMode acquiredLockMode = lockMode == LockMode.None ? LockMode.Read : lockMode;
-			await (LoadFromResultSetAsync(dr, i, obj, concretePersister, key, acquiredLockMode, persister, session, cancellationToken)).ConfigureAwait(false);
-
+			await (LoadFromResultSetAsync(dr, i, obj, concretePersister, key, acquiredLockMode, persister, session, useOptionalObject, cancellationToken)).ConfigureAwait(false);
+			
 			// materialize associations (and initialize the object) later
 			hydratedObjects.Add(obj);
 
@@ -886,7 +887,7 @@ internal static async Task UpdateCacheForEntityAsync(
 		/// </summary>
 		private async Task LoadFromResultSetAsync(DbDataReader rs, int i, object obj, ILoadable persister, EntityKey key,
 									   LockMode lockMode, ILoadable rootPersister,
-									   ISessionImplementor session, CancellationToken cancellationToken)
+									   ISessionImplementor session, bool lazyPropertiesAreUnfetched, CancellationToken cancellationToken)
 		{
 			cancellationToken.ThrowIfCancellationRequested();
 			object id = key.Identifier;
@@ -912,7 +913,7 @@ private async Task LoadFromResultSetAsync(DbDataReader rs, int i, object obj, IL
 
 			object rowId = persister.HasRowId ? rs[EntityAliases[i].RowIdAlias] : null;
 
-			TwoPhaseLoad.PostHydrate(persister, id, values, rowId, obj, lockMode, session);
+			TwoPhaseLoad.PostHydrate(persister, id, values, rowId, obj, lockMode, lazyPropertiesAreUnfetched, session);
 		}
 
 		/// <summary>