Skip to content

Make SnapshotModelProcessor idempotent. #35432

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 11, 2025
Merged

Make SnapshotModelProcessor idempotent. #35432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions src/EFCore.Design/Migrations/Internal/SnapshotModelProcessor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,9 @@ public SnapshotModelProcessor(
/// </summary>
public virtual IModel? Process(IReadOnlyModel? model, bool resetVersion = false)
{
if (model == null)
if (model == null
|| model is not Model mutableModel
|| mutableModel.IsReadOnly)
{
return null;
}
Expand All @@ -79,13 +81,10 @@ public SnapshotModelProcessor(
}
}

if (model is IMutableModel mutableModel)
mutableModel.RemoveAnnotation("ChangeDetector.SkipDetectChanges");
if (resetVersion)
{
mutableModel.RemoveAnnotation("ChangeDetector.SkipDetectChanges");
if (resetVersion)
{
mutableModel.SetProductVersion(ProductInfo.GetVersion());
}
mutableModel.SetProductVersion(ProductInfo.GetVersion());
}

return _modelRuntimeInitializer.Initialize((IModel)model, designTime: true, validationLogger: null);
Expand Down
5 changes: 4 additions & 1 deletion test/EFCore.Design.Tests/Migrations/Design/SnapshotModelProcessorTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ public void Updates_provider_annotations_on_model()

var reporter = new TestOperationReporter();

new SnapshotModelProcessor(reporter, DummyModelRuntimeInitializer.Instance).Process(model);
var processor = new SnapshotModelProcessor(reporter, DummyModelRuntimeInitializer.Instance);
processor.Process(model);

AssertAnnotations(model);
AssertAnnotations(entityType);
Expand All @@ -54,6 +55,8 @@ public void Updates_provider_annotations_on_model()
AssertAnnotations(nav2);
AssertAnnotations(index);

Assert.Same(model, processor.Process(model));

Assert.Empty(reporter.Messages);
}

Expand Down