Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 8 additions & 2 deletions src/EFCore.Relational/Extensions/RelationalModelExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,14 @@ public static IRelationalModel GetRelationalModel(this IModel model)
if (relationalModel == null)
{
var relationalModelFactory = (Func<IRelationalModel>?)model.FindRuntimeAnnotationValue(
RelationalAnnotationNames.RelationalModelFactory)
?? throw new InvalidOperationException(CoreStrings.ModelNotFinalized(nameof(GetRelationalModel)));
RelationalAnnotationNames.RelationalModelFactory);
if (relationalModelFactory == null)
{
// The factory is removed after the relational model is created, which could have happened on another thread
return (IRelationalModel?)model.FindRuntimeAnnotationValue(RelationalAnnotationNames.RelationalModel)
?? throw new InvalidOperationException(CoreStrings.ModelNotFinalized(nameof(GetRelationalModel)));
}

lock (relationalModelFactory)
{
relationalModel = model.GetOrAddRuntimeAnnotationValue(
Expand Down
31 changes: 31 additions & 0 deletions test/EFCore.Relational.Tests/Metadata/RelationalModelTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,17 @@ public void GetRelationalModel_throws_if_convention_has_not_run()
Assert.Throws<InvalidOperationException>(() => ((IModel)modelBuilder.Model).GetRelationalModel()).Message);
}

[ConditionalFact]
public void GetRelationalModel_does_not_throw_if_relational_model_is_created_concurrently()
{
var model = new ConcurrentlyInitializedModel();
var relationalModel = new RelationalModel(model);
model.AddRuntimeAnnotation(
RelationalAnnotationNames.RelationalModelFactory, (Func<IRelationalModel>)(() => relationalModel));

Assert.Same(relationalModel, model.GetRelationalModel());
}

[ConditionalFact]
public void Both_design_and_runtime_RelationalModels_are_built_for_external_model()
{
Expand Down Expand Up @@ -3234,6 +3245,26 @@ protected virtual TestHelpers.TestModelBuilder CreateConventionModelBuilder()
public static void AssertEqual(IRelationalModel expectedModel, IRelationalModel actualModel)
=> RelationalModelAsserter.Instance.AssertEqual(expectedModel, actualModel);

private class ConcurrentlyInitializedModel() : RuntimeModel(skipDetectChanges: false, modelId: Guid.Empty, entityTypeCount: 0)
{
private bool _concurrentCallMade;

public override Annotation FindRuntimeAnnotation(string name)
{
var annotation = base.FindRuntimeAnnotation(name);
if (name == RelationalAnnotationNames.RelationalModel
&& annotation == null
&& !_concurrentCallMade)
{
// Simulates another thread creating the relational model right after this lookup didn't find it
_concurrentCallMade = true;
this.GetRelationalModel();
}

return annotation;
}
}

public enum Mapping
{
TPH,
Expand Down
Loading