Async fix for "Generate values for PK properties that are also self-r…

…eferencing FK properties" (#29134)
dotnet · Sep 19, 2022 · b02da05 · b02da05
1 parent 121bb26
commit b02da05
Show file tree

Hide file tree

Showing 31 changed files with 143 additions and 142 deletions.
diff --git a/src/EFCore/ChangeTracking/Internal/KeyPropagator.cs b/src/EFCore/ChangeTracking/Internal/KeyPropagator.cs
@@ -77,7 +77,8 @@ public KeyPropagator(
         var principalEntry = TryPropagateValue(entry, property, generationProperty);
 
         if (principalEntry == null
-            && property.IsKey())
+            && property.IsKey()
+            && !property.IsForeignKeyToSelf())
         {
             var valueGenerator = TryGetValueGenerator(
                 generationProperty,

diff --git a/test/EFCore.Cosmos.FunctionalTests/ConfigPatternsCosmosTest.cs b/test/EFCore.Cosmos.FunctionalTests/ConfigPatternsCosmosTest.cs
@@ -59,9 +59,9 @@ public async Task Should_not_throw_if_specified_region_is_right()
         using var context = new CustomerContext(options);
         context.Database.EnsureCreated();
 
-        context.Add(customer);
+        await context.AddAsync(customer);
 
-        context.SaveChanges();
+        await context.SaveChangesAsync();
     }
 
     [ConditionalFact]
@@ -78,9 +78,9 @@ public async Task Should_throw_if_specified_region_is_wrong()
                 using var context = new CustomerContext(options);
                 context.Database.EnsureCreated();
 
-                context.Add(customer);
+                await context.AddAsync(customer);
 
-                context.SaveChanges();
+                await context.SaveChangesAsync();
             });
 
         Assert.Equal(
@@ -101,9 +101,9 @@ public async Task Should_not_throw_if_specified_connection_mode_is_right()
         using var context = new CustomerContext(options);
         context.Database.EnsureCreated();
 
-        context.Add(customer);
+        await context.AddAsync(customer);
 
-        context.SaveChanges();
+        await context.SaveChangesAsync();
     }
 
     [ConditionalFact]
@@ -121,9 +121,9 @@ public async Task Should_throw_if_specified_connection_mode_is_wrong()
                 using var context = new CustomerContext(options);
                 context.Database.EnsureCreated();
 
-                context.Add(customer);
+                await context.AddAsync(customer);
 
-                context.SaveChanges();
+                await context.SaveChangesAsync();
             });
     }
 

diff --git a/test/EFCore.Cosmos.FunctionalTests/CosmosConcurrencyTest.cs b/test/EFCore.Cosmos.FunctionalTests/CosmosConcurrencyTest.cs
@@ -61,7 +61,7 @@ public async Task Etag_will_return_when_content_response_enabled_false()
         {
             await context.Database.EnsureCreatedAsync();
 
-            context.Add(customer);
+            await context.AddAsync(customer);
 
             await context.SaveChangesAsync();
         }
@@ -96,7 +96,7 @@ public async Task Etag_will_return_when_content_response_enabled_true()
         {
             await context.Database.EnsureCreatedAsync();
 
-            context.Add(customer);
+            await context.AddAsync(customer);
 
             await context.SaveChangesAsync();
         }
@@ -144,7 +144,7 @@ public async Task Etag_is_updated_in_entity_after_SaveChanges(bool? contentRespo
         {
             await context.Database.EnsureCreatedAsync();
 
-            context.Add(customer);
+            await context.AddAsync(customer);
 
             await context.SaveChangesAsync();
 

diff --git a/test/EFCore.Cosmos.FunctionalTests/EmbeddedDocumentsTest.cs b/test/EFCore.Cosmos.FunctionalTests/EmbeddedDocumentsTest.cs
@@ -83,7 +83,7 @@ public virtual async Task Can_attach_owner_with_dependents()
         using (var context = new EmbeddedTransportationContext(options))
         {
             //Issue #15289
-            var firstVehicleEntry = context.Add(firstVehicle);
+            var firstVehicleEntry = await context.AddAsync(firstVehicle);
             firstVehicleEntry.State = EntityState.Unchanged;
             firstVehicle.Operator.Name += "1";
 
@@ -112,7 +112,7 @@ public virtual async Task Can_manipulate_embedded_collections(bool useIds)
         Address addedAddress3;
         using (var context = new EmbeddedTransportationContext(options))
         {
-            context.Add(new Person { Id = 1 });
+            await context.AddAsync(new Person { Id = 1 });
             existingAddress1Person2 = new Address
             {
                 Street = "Second",
@@ -140,7 +140,7 @@ public virtual async Task Can_manipulate_embedded_collections(bool useIds)
                 Street = "First",
                 City = "Village"
             };
-            context.Add(new Person { Id = 2, Addresses = new List<Address> { existingAddress1Person2, existingAddress2Person2 } });
+            await context.AddAsync(new Person { Id = 2, Addresses = new List<Address> { existingAddress1Person2, existingAddress2Person2 } });
             existingAddress1Person3 = new Address
             {
                 Street = "First",
@@ -169,7 +169,7 @@ public virtual async Task Can_manipulate_embedded_collections(bool useIds)
                 AddressTitle = new AddressTitle { Title = "P3 Billing" }
             };
 
-            context.Add(new Person { Id = 3, Addresses = new List<Address> { existingAddress1Person3, existingAddress2Person3 } });
+            await context.AddAsync(new Person { Id = 3, Addresses = new List<Address> { existingAddress1Person3, existingAddress2Person3 } });
 
             await context.SaveChangesAsync();
 
@@ -407,7 +407,7 @@ public virtual async Task Properties_on_owned_types_can_be_client_generated()
                 AddressTitle = new AddressTitle()
             };
 
-            context.Add(new Person { Id = 1, Addresses = new List<Address> { address } });
+            await context.AddAsync(new Person { Id = 1, Addresses = new List<Address> { address } });
             Assert.Equal("DefaultTitle", address.AddressTitle.Title);
 
             await context.SaveChangesAsync();
@@ -441,7 +441,7 @@ public virtual async Task Can_use_non_int_keys_for_embedded_entities()
             var person = new Person { Id = 1 };
             address = new Address { Street = "Second", City = "Village" };
             person.Addresses.Add(address);
-            context.Add(person);
+            await context.AddAsync(person);
 
             var addressEntry = context.Entry(address);
             addressGuid = (Guid)addressEntry.Property("Id").CurrentValue;
@@ -505,7 +505,7 @@ public virtual async Task Can_query_just_embedded_collection()
 
         using (var context = new EmbeddedTransportationContext(options))
         {
-            context.Add(
+            await context.AddAsync(
                 new Person
                 {
                     Id = 3,
@@ -531,7 +531,7 @@ public virtual async Task Inserting_dependent_without_principal_throws()
     {
         var options = Fixture.CreateOptions(seed: false);
         using var context = new EmbeddedTransportationContext(options);
-        context.Add(
+        await context.AddAsync(
             new LicensedOperator
             {
                 Name = "Jack Jackson",
@@ -586,7 +586,7 @@ public virtual async Task Can_change_principal_instance_non_derived()
             };
 
             context.Remove(bike);
-            context.Add(newBike);
+            await context.AddAsync(newBike);
 
             TestSqlLoggerFactory.Clear();
             await context.SaveChangesAsync();

diff --git a/test/EFCore.Cosmos.FunctionalTests/EndToEndCosmosTest.cs b/test/EFCore.Cosmos.FunctionalTests/EndToEndCosmosTest.cs
@@ -102,7 +102,7 @@ public async Task Can_add_update_delete_end_to_end_async()
         {
             await context.Database.EnsureCreatedAsync();
 
-            context.Add(customer);
+            await context.AddAsync(customer);
 
             await context.SaveChangesAsync();
 
@@ -170,11 +170,11 @@ public async Task Can_add_update_delete_detached_entity_end_to_end_async()
         {
             await context.Database.EnsureCreatedAsync();
 
-            var entry = context.Add(customer);
+            var entry = await context.AddAsync(customer);
 
             await context.SaveChangesAsync();
 
-            context.Add(customer);
+            await context.AddAsync(customer);
 
             storeId = entry.Property<string>(StoreKeyConvention.DefaultIdPropertyName).CurrentValue;
         }
@@ -319,7 +319,7 @@ public async Task Can_add_update_untracked_properties_async()
         {
             await context.Database.EnsureCreatedAsync();
 
-            var entry = context.Add(customer);
+            var entry = await context.AddAsync(customer);
 
             await context.SaveChangesAsync();
 
@@ -336,7 +336,7 @@ public async Task Can_add_update_untracked_properties_async()
         {
             Assert.Empty(await context.Set<Customer>().ToListAsync());
 
-            var entry = context.Add(customer);
+            var entry = await context.AddAsync(customer);
 
             entry.Property<JObject>("__jObject").CurrentValue = new JObject { ["key1"] = "value1" };
 
@@ -408,7 +408,7 @@ public async Task Can_add_update_delete_end_to_end_with_Guid_async()
         {
             await context.Database.EnsureCreatedAsync();
 
-            context.Add(customer);
+            await context.AddAsync(customer);
 
             await context.SaveChangesAsync();
         }
@@ -459,7 +459,7 @@ public async Task Can_add_update_delete_end_to_end_with_DateTime_async()
         {
             await context.Database.EnsureCreatedAsync();
 
-            var entry = context.Add(customer);
+            var entry = await context.AddAsync(customer);
 
             Assert.Equal("CustomerDateTime|0001-01-01T00:00:00.0000000|Theon^2F^5C^23^5C^5C^3F", entry.CurrentValues["__id"]);
 
@@ -588,7 +588,7 @@ public async Task Can_add_update_delete_with_dateTime_string_end_to_end_async()
         {
             await context.Database.EnsureCreatedAsync();
 
-            context.Add(customer);
+            await context.AddAsync(customer);
 
             await context.SaveChangesAsync();
         }
@@ -828,7 +828,7 @@ private async Task Can_add_update_delete_with_collection<TCollection>(
         {
             await context.Database.EnsureCreatedAsync();
 
-            context.Add(customer);
+            await context.AddAsync(customer);
 
             await context.SaveChangesAsync();
         }
@@ -911,8 +911,8 @@ public async Task Can_read_with_find_with_resource_id_async()
                 context.Model.FindEntityType(typeof(CustomerWithResourceId))
                     .FindProperty(StoreKeyConvention.DefaultIdPropertyName));
 
-            context.Add(customer);
-            context.Add(
+            await context.AddAsync(customer);
+            await context.AddAsync(
                 new CustomerWithResourceId
                 {
                     id = "42",
@@ -1039,8 +1039,8 @@ public async Task Can_read_with_find_with_partition_key_and_value_generator_asyn
         {
             await context.Database.EnsureCreatedAsync();
 
-            context.Add(customer);
-            context.Add(
+            await context.AddAsync(customer);
+            await context.AddAsync(
                 new Customer
                 {
                     Id = 42,
@@ -1207,7 +1207,7 @@ public async Task Can_read_with_find_with_partition_key_not_part_of_primary_key(
         {
             await context.Database.EnsureCreatedAsync();
 
-            context.Add(customer);
+            await context.AddAsync(customer);
 
             await context.SaveChangesAsync();
         }
@@ -1233,7 +1233,7 @@ public async Task Can_read_with_find_without_partition_key()
         {
             await context.Database.EnsureCreatedAsync();
 
-            context.Add(customer);
+            await context.AddAsync(customer);
 
             await context.SaveChangesAsync();
         }
@@ -1259,7 +1259,7 @@ public async Task Can_read_with_find_with_PK_partition_key()
         {
             await context.Database.EnsureCreatedAsync();
 
-            context.Add(customer);
+            await context.AddAsync(customer);
 
             await context.SaveChangesAsync();
         }
@@ -1285,7 +1285,7 @@ public async Task Can_read_with_find_with_PK_resource_id()
         {
             await context.Database.EnsureCreatedAsync();
 
-            context.Add(customer);
+            await context.AddAsync(customer);
 
             await context.SaveChangesAsync();
         }
@@ -1449,14 +1449,14 @@ public async Task Can_use_detached_entities_without_discriminators()
         {
             await context.Database.EnsureCreatedAsync();
 
-            context.Add(customer);
+            await context.AddAsync(customer);
 
             await context.SaveChangesAsync();
         }
 
         using (var context = new NoDiscriminatorCustomerContext(options))
         {
-            context.Add(customer).State = EntityState.Modified;
+            (await context.AddAsync(customer)).State = EntityState.Modified;
 
             customer.Name = "Theon Greyjoy";
 
@@ -1470,7 +1470,7 @@ public async Task Can_use_detached_entities_without_discriminators()
             Assert.Equal(42, customerFromStore.Id);
             Assert.Equal("Theon Greyjoy", customerFromStore.Name);
 
-            context.Add(customer).State = EntityState.Deleted;
+            (await context.AddAsync(customer)).State = EntityState.Deleted;
 
             await context.SaveChangesAsync();
         }
@@ -1570,7 +1570,7 @@ public async Task Can_use_non_persisted_properties()
         {
             await context.Database.EnsureCreatedAsync();
 
-            context.Add(customer);
+            await context.AddAsync(customer);
 
             await context.SaveChangesAsync();
             Assert.Equal("Theon", customer.Name);
@@ -1609,7 +1609,7 @@ public async Task Add_update_delete_query_throws_if_no_container()
         var customer = new Customer { Id = 42, Name = "Theon" };
         using (var context = new CustomerContext(options))
         {
-            context.Add(customer);
+            await context.AddAsync(customer);
 
             Assert.StartsWith(
                 "Response status code does not indicate success: NotFound (404); Substatus: 0",
@@ -1618,7 +1618,7 @@ public async Task Add_update_delete_query_throws_if_no_container()
 
         using (var context = new CustomerContext(options))
         {
-            context.Add(customer).State = EntityState.Modified;
+            (await context.AddAsync(customer)).State = EntityState.Modified;
 
             Assert.StartsWith(
                 "Response status code does not indicate success: NotFound (404); Substatus: 0",
@@ -1627,7 +1627,7 @@ public async Task Add_update_delete_query_throws_if_no_container()
 
         using (var context = new CustomerContext(options))
         {
-            context.Add(customer).State = EntityState.Deleted;
+            (await context.AddAsync(customer)).State = EntityState.Deleted;
 
             Assert.StartsWith(
                 "Response status code does not indicate success: NotFound (404); Substatus: 0",
@@ -1653,7 +1653,7 @@ await Assert.ThrowsAnyAsync<Exception>(
             {
                 await context.Database.EnsureCreatedAsync();
 
-                context.Add(new ConflictingIncompatibleId { id = 42 });
+                await context.AddAsync(new ConflictingIncompatibleId { id = 42 });
 
                 await context.SaveChangesAsync();
             });
@@ -1688,7 +1688,7 @@ public async Task Can_add_update_delete_end_to_end_with_conflicting_id()
         {
             await context.Database.EnsureCreatedAsync();
 
-            context.Add(entity);
+            await context.AddAsync(entity);
 
             await context.SaveChangesAsync();
         }
@@ -1754,7 +1754,7 @@ public async Task Can_have_non_string_property_named_Discriminator()
         using var context = new NonStringDiscriminatorContext(Fixture.CreateOptions());
         context.Database.EnsureCreated();
 
-        context.Add(new NonStringDiscriminator { Id = 1 });
+        await context.AddAsync(new NonStringDiscriminator { Id = 1 });
         await context.SaveChangesAsync();
 
         Assert.NotNull(await context.Set<NonStringDiscriminator>().OrderBy(e => e.Id).FirstOrDefaultAsync());

diff --git a/test/EFCore.Cosmos.FunctionalTests/Internal/IdentifierShadowValuePresenceTest.cs b/test/EFCore.Cosmos.FunctionalTests/Internal/IdentifierShadowValuePresenceTest.cs
@@ -15,7 +15,7 @@ public async Task Entities_with_null_PK_can_be_added_with_normal_use_of_DbContex
 
         Assert.Null(item.Id);
 
-        var entry = context.Add(item);
+        var entry = await context.AddAsync(item);
 
         var id = entry.Property("__id").CurrentValue;