NpgsqlParameterCollection.Clone() should set correct collection instance (#6066)

mgravell · vonzshik · commit 8fd4b434164e · 2025-03-24T12:41:20.000+03:00
fix #6065 (cherry picked from commit e8ce19f)
diff --git a/src/Npgsql/NpgsqlParameterCollection.cs b/src/Npgsql/NpgsqlParameterCollection.cs
@@ -664,7 +664,7 @@ internal void CloneTo(NpgsqlParameterCollection other)
         foreach (var param in InternalList)
         {
             var newParam = param.Clone();
-            newParam.Collection = this;
+            newParam.Collection = other;
             other.InternalList.Add(newParam);
         }
 
diff --git a/test/Npgsql.Tests/NpgsqlParameterCollectionTests.cs b/test/Npgsql.Tests/NpgsqlParameterCollectionTests.cs
@@ -4,6 +4,7 @@
 using System.Data;
 using System.Data.Common;
 using System.Diagnostics.CodeAnalysis;
+using System.Linq;
 
 namespace Npgsql.Tests;
 
@@ -320,6 +321,18 @@ public void Clean_name()
         Assert.AreEqual(NpgsqlParameter.PositionalName, param.ParameterName);
     }
 
+    [Test]
+    public void Clone_sets_correct_collection()
+    {
+        var cmd = new NpgsqlCommand();
+        cmd.Parameters.Add(new NpgsqlParameter<int> { TypedValue = 42 });
+        Assert.AreSame(cmd.Parameters, cmd.Parameters.Single().Collection);
+
+        cmd = cmd.Clone();
+        Assert.AreSame(cmd.Parameters, cmd.Parameters.Single().Collection);
+    }
+
+
     public NpgsqlParameterCollectionTests(CompatMode compatMode)
     {
         _compatMode = compatMode;

Original file line number	Diff line number	Diff line change
`@@ -664,7 +664,7 @@ internal void CloneTo(NpgsqlParameterCollection other)`
`664`	`664`	`foreach (var param in InternalList)`
`665`	`665`	`{`
`666`	`666`	`var newParam = param.Clone();`
`667`		`- newParam.Collection = this;`
	`667`	`+ newParam.Collection = other;`
`668`	`668`	`other.InternalList.Add(newParam);`
`669`	`669`	`}`
`670`	`670`