[Internal] ContainerProperties: Fixes version reset when setting Part…

…itionKeyPath (#3637) * Remember previous value * test
Azure · Jan 9, 2023 · 416b154 · 416b154
1 parent 3c875c7
commit 416b154
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/Microsoft.Azure.Cosmos/src/Resource/Settings/ContainerProperties.cs b/Microsoft.Azure.Cosmos/src/Resource/Settings/ContainerProperties.cs
@@ -362,10 +362,17 @@ public string PartitionKeyPath
                     throw new ArgumentNullException(nameof(this.PartitionKeyPath));
                 }
 
+                PartitionKeyDefinitionVersion? currentDefinitionVersion = this.PartitionKeyDefinitionVersion;
+
                 this.PartitionKey = new PartitionKeyDefinition
                 {
                     Paths = new Collection<string>() { value }
                 };
+
+                if (currentDefinitionVersion.HasValue)
+                {
+                    this.PartitionKeyDefinitionVersion = currentDefinitionVersion.Value;
+                }
             }
         }
 

diff --git a/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.Tests/CosmosContainerSettingsTests.cs b/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.Tests/CosmosContainerSettingsTests.cs
@@ -165,6 +165,17 @@ public void ValidateIncludedPathSerialization()
             }
         }
 
+        [TestMethod]
+        public void SettingPKShouldNotResetVersion()
+        {
+            ContainerProperties containerProperties = new();
+            containerProperties.Id = "test";
+            containerProperties.PartitionKeyDefinitionVersion = Cosmos.PartitionKeyDefinitionVersion.V2;
+            containerProperties.PartitionKeyPath = "/id";
+
+            Assert.AreEqual(Cosmos.PartitionKeyDefinitionVersion.V2, containerProperties.PartitionKeyDefinitionVersion);
+        }
+
         private static string SerializeDocumentCollection(DocumentCollection collection)
         {
             using (MemoryStream ms = new MemoryStream())