FK dependency ordering wrong when replacing an inline owned entity

[bachratyg]

Bug description

See gist below.
Document has an optional owned File
File has a required reference to Content.
When File is replaced and the original Content is removed an exception is thrown on SaveChanges.

Actual sql:

DELETE FROM [Contents]
OUTPUT 1
WHERE [Id] = @p0;
INSERT INTO [Contents] ([Id], [Data])
VALUES (@p1, @p2);
UPDATE [Documents] SET [File_ContentId] = @p3, [File_Id] = @p4, [File_Name] = @p5
OUTPUT 1
WHERE [Id] = @p6;

Expected sql:

INSERT INTO [Contents] ([Id], [Data])
VALUES (@p1, @p2);
UPDATE [Documents] SET [File_ContentId] = @p3, [File_Id] = @p4, [File_Name] = @p5
OUTPUT 1
WHERE [Id] = @p6;
DELETE FROM [Contents]
OUTPUT 1
WHERE [Id] = @p0;

This works fine if the File entity is not owned (remove the [Owned] attribute and uncomment the indicated line in the gist to test this)

Also reproduces on EFC 8.0.11 and .NET 8

Your code

https://gist.github.com/bachratyg/d073cbb7c47a494939f2aa5c419992c2

Stack traces

Stack trace

      An exception occurred in the database while saving changes for context type 'AppDb'.
      Microsoft.EntityFrameworkCore.DbUpdateException: An error occurred while saving the entity changes. See the inner exception for details.
       ---> Microsoft.Data.SqlClient.SqlException (0x80131904): The DELETE statement conflicted with the REFERENCE constraint "FK_Documents_Contents_File_ContentId". The conflict occurred in database "Test", table "dbo.Documents", column 'File_ContentId'.
         at Microsoft.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
         at Microsoft.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
         at Microsoft.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose)
         at Microsoft.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady)
         at Microsoft.Data.SqlClient.SqlDataReader.TryHasMoreRows(Boolean& moreRows)
         at Microsoft.Data.SqlClient.SqlDataReader.TryReadInternal(Boolean setTimeout, Boolean& more)
         at Microsoft.Data.SqlClient.SqlDataReader.Read()
         at Microsoft.EntityFrameworkCore.Storage.RelationalDataReader.Read()
         at Microsoft.EntityFrameworkCore.Update.AffectedCountModificationCommandBatch.ConsumeResultSetWithRowsAffectedOnly(Int32 commandIndex, RelationalDataReader reader)
         at Microsoft.EntityFrameworkCore.Update.AffectedCountModificationCommandBatch.Consume(RelationalDataReader reader)
      ClientConnectionId:62ce916b-d921-4135-87f3-892b604a5a45
      Error Number:547,State:0,Class:16
         --- End of inner exception stack trace ---
         at Microsoft.EntityFrameworkCore.Update.AffectedCountModificationCommandBatch.Consume(RelationalDataReader reader)
         at Microsoft.EntityFrameworkCore.Update.ReaderModificationCommandBatch.Execute(IRelationalConnection connection)
         at Microsoft.EntityFrameworkCore.SqlServer.Update.Internal.SqlServerModificationCommandBatch.Execute(IRelationalConnection connection)
         at Microsoft.EntityFrameworkCore.Update.Internal.BatchExecutor.Execute(IEnumerable`1 commandBatches, IRelationalConnection connection)
         at Microsoft.EntityFrameworkCore.Storage.RelationalDatabase.SaveChanges(IList`1 entries)
         at Microsoft.EntityFrameworkCore.ChangeTracking.Internal.StateManager.SaveChanges(IList`1 entriesToSave)
         at Microsoft.EntityFrameworkCore.ChangeTracking.Internal.StateManager.SaveChanges(StateManager stateManager, Boolean acceptAllChangesOnSuccess)
         at Microsoft.EntityFrameworkCore.ChangeTracking.Internal.StateManager.<>c.<SaveChanges>b__112_0(DbContext _, ValueTuple`2 t)
         at Microsoft.EntityFrameworkCore.SqlServer.Storage.Internal.SqlServerExecutionStrategy.Execute[TState,TResult](TState state, Func`3 operation, Func`3 verifySucceeded)
         at Microsoft.EntityFrameworkCore.ChangeTracking.Internal.StateManager.SaveChanges(Boolean acceptAllChangesOnSuccess)
         at Microsoft.EntityFrameworkCore.DbContext.SaveChanges(Boolean acceptAllChangesOnSuccess)

EF Core version

9.0.4

Database provider

Microsoft.EntityFrameworkCore.SqlServer

Target framework

.NET 9.0

Operating system

Windows 10

IDE

Visual Studio 2022 17.13

[bachratyg]

I think the root of the problem is here:

efcore/src/EFCore.Relational/Update/Internal/ColumnAccessorsFactory.cs

Line 55 in bafe387

var providerValue = entry.GetCurrentProviderValue(property);

After getting the column mapping for the FK the entity entry on the modification command is used to get the original value of the column. However there are two File entities in the tracker: one added and one deleted. Note that only the added one is present here (another bug?), which only has the new values. The method thus returns the new FK value instead of the old one and the update graph ends up missing the corresponding edge for the topological sort.

The update command's ColumnModifications contain the correct original and current values. Those should be used instead of the entity entries.

Full stack trace (9.0.4)

Microsoft.EntityFrameworkCore.Update.Internal.ColumnAccessorsFactory.CreateOriginalValueGetter.AnonymousMethod__0(Microsoft.EntityFrameworkCore.Update.IReadOnlyModificationCommand c) at /_/src/EFCore.Relational/Update/Internal/ColumnAccessorsFactory.cs:line 84
Microsoft.EntityFrameworkCore.Update.Internal.SimpleNullableRowForeignKeyValueFactory<System.Guid, System.Guid>.TryCreateDependentKeyValue(Microsoft.EntityFrameworkCore.Update.IReadOnlyModificationCommand command, bool fromOriginalValues, out System.Guid key) at /_/src/EFCore.Relational/Update/Internal/SimpleNullableRowForeignKeyValueFactory.cs:line 45
Microsoft.EntityFrameworkCore.Update.Internal.RowForeignKeyValueFactory<System.Guid, System.Guid>.CreateDependentEquatableKeyValue(Microsoft.EntityFrameworkCore.Update.IReadOnlyModificationCommand command, bool fromOriginalValues) at /_/src/EFCore.Relational/Update/Internal/RowForeignKeyValueFactory.cs:line 130
Microsoft.EntityFrameworkCore.Update.Internal.CommandBatchPreparer.AddForeignKeyEdges() at /_/src/EFCore.Relational/Update/Internal/CommandBatchPreparer.cs:line 712
Microsoft.EntityFrameworkCore.Update.Internal.CommandBatchPreparer.TopologicalSort(System.Collections.Generic.IEnumerable<Microsoft.EntityFrameworkCore.Update.IReadOnlyModificationCommand> commands) at /_/src/EFCore.Relational/Update/Internal/CommandBatchPreparer.cs:line 373
Microsoft.EntityFrameworkCore.Update.Internal.CommandBatchPreparer.BatchCommands(System.Collections.Generic.IList<Microsoft.EntityFrameworkCore.Update.IUpdateEntry> entries, Microsoft.EntityFrameworkCore.Update.IUpdateAdapter updateAdapter) at /_/src/EFCore.Relational/Update/Internal/CommandBatchPreparer.cs:line 69
Microsoft.EntityFrameworkCore.Update.Internal.BatchExecutor.Execute(System.Collections.Generic.IEnumerable<Microsoft.EntityFrameworkCore.Update.ModificationCommandBatch> commandBatches, Microsoft.EntityFrameworkCore.Storage.IRelationalConnection connection) at /_/src/EFCore.Relational/Update/Internal/BatchExecutor.cs:line 55
Microsoft.EntityFrameworkCore.Storage.RelationalDatabase.SaveChanges(System.Collections.Generic.IList<Microsoft.EntityFrameworkCore.Update.IUpdateEntry> entries) at /_/src/EFCore.Relational/Storage/RelationalDatabase.cs:line 57
Microsoft.EntityFrameworkCore.ChangeTracking.Internal.StateManager.SaveChanges(System.Collections.Generic.IList<Microsoft.EntityFrameworkCore.Update.IUpdateEntry> entriesToSave) at /_/src/EFCore/ChangeTracking/Internal/StateManager.cs:line 1283
Microsoft.EntityFrameworkCore.ChangeTracking.Internal.StateManager.SaveChanges(Microsoft.EntityFrameworkCore.ChangeTracking.Internal.StateManager stateManager, bool acceptAllChangesOnSuccess) at /_/src/EFCore/ChangeTracking/Internal/StateManager.cs:line 1333
Microsoft.EntityFrameworkCore.ChangeTracking.Internal.StateManager.SaveChanges.AnonymousMethod__112_0(Microsoft.EntityFrameworkCore.DbContext _, (Microsoft.EntityFrameworkCore.ChangeTracking.Internal.StateManager StateManager, bool AcceptAllChangesOnSuccess) t) at /_/src/EFCore/ChangeTracking/Internal/StateManager.cs:line 1315
Microsoft.EntityFrameworkCore.SqlServer.Storage.Internal.SqlServerExecutionStrategy.Execute<(Microsoft.EntityFrameworkCore.ChangeTracking.Internal.StateManager, bool), int>((Microsoft.EntityFrameworkCore.ChangeTracking.Internal.StateManager, bool) state, System.Func<Microsoft.EntityFrameworkCore.DbContext, (Microsoft.EntityFrameworkCore.ChangeTracking.Internal.StateManager, bool), int> operation, System.Func<Microsoft.EntityFrameworkCore.DbContext, (Microsoft.EntityFrameworkCore.ChangeTracking.Internal.StateManager, bool), Microsoft.EntityFrameworkCore.Storage.ExecutionResult<int>> verifySucceeded) at /_/src/EFCore.SqlServer/Storage/Internal/SqlServerExecutionStrategy.cs:line 55
Microsoft.EntityFrameworkCore.ChangeTracking.Internal.StateManager.SaveChanges(bool acceptAllChangesOnSuccess) at /_/src/EFCore/ChangeTracking/Internal/StateManager.cs:line 1311
Microsoft.EntityFrameworkCore.DbContext.SaveChanges(bool acceptAllChangesOnSuccess) at /_/src/EFCore/DbContext.cs:line 649
Microsoft.EntityFrameworkCore.DbContext.SaveChanges() at /_/src/EFCore/DbContext.cs:line 600