From ccd824dcc328497d1f2c28443fef472cff0fb07b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matija=20Ko=C5=BEelj?= <matija.kozelj@tompit.net>
Date: Tue, 24 Jan 2023 16:52:11 +0100
Subject: [PATCH] Fix EntityStorage parameter binding

---
 src/Connected.Data/Storage/EntityStorage.cs     | 8 ++++++--
 src/Connected.Data/Storage/ReturnValueBinder.cs | 7 ++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/Connected.Data/Storage/EntityStorage.cs b/src/Connected.Data/Storage/EntityStorage.cs
index a83d8ea..835c37f 100644
--- a/src/Connected.Data/Storage/EntityStorage.cs
+++ b/src/Connected.Data/Storage/EntityStorage.cs
@@ -152,7 +152,11 @@ internal class EntityStorage<TEntity> : IAsyncEnumerable<TEntity>, IStorage<TEnt
 
 		await Execute(new StorageContextArgs(operation));
 
-		return entity;
+		var clone = entity.Clone();
+
+		ReturnValueBinder.Bind(operation, clone);
+
+		return clone;
 	}
 	/// <summary>
 	/// Performs the update on the specified entity with optional concurrency callback support.
@@ -274,7 +278,7 @@ internal class EntityStorage<TEntity> : IAsyncEnumerable<TEntity>, IStorage<TEnt
 		/*
 		 * Bind storage parameters with operation parameters.
 		 */
-		ReturnValueBinder.Bind(writer, args.Operation);
+		ReturnValueBinder.Bind(writer.Operation, args.Operation);
 
 		return recordsAffected;
 	}
diff --git a/src/Connected.Data/Storage/ReturnValueBinder.cs b/src/Connected.Data/Storage/ReturnValueBinder.cs
index 888ae10..3cd66f5 100644
--- a/src/Connected.Data/Storage/ReturnValueBinder.cs
+++ b/src/Connected.Data/Storage/ReturnValueBinder.cs
@@ -8,14 +8,11 @@ namespace Connected.Data.Storage
 {
     internal static class ReturnValueBinder
 	{
-		public static void Bind(IStorageWriter w, IStorageOperation operation)
+		public static void Bind(IStorageOperation operation, object entity)
 		{
 			List<PropertyInfo> properties = null;
 
-			if (w.Operation.Parameters is null)
-				return;
-
-			foreach (var parameter in w.Operation.Parameters)
+			foreach (var parameter in operation.Parameters)
 			{
 				if (parameter.Direction != ParameterDirection.ReturnValue && parameter.Direction != ParameterDirection.Output)
 					continue;