Added a ModelBuilder.FinalizeModel method to support building outside the context #13455
Conversation
ajcvickers
added
the
closed-fixed
|
|
|
@AndriySvyryd We should discuss whether or not this call should actually do validation--@divega had some string opinions on it in triage. That aside, we need a way to get the IModelValidator to the place it is needed, which requires some plumbing. So I don't want to do this if we decide we shouldn't validate in this method. |
ajcvickers
removed
the
closed-fixed
ajcvickers
force-pushed
the
OutOfContext0930
branch
from
a807ade to
a213fca
Compare
|
@AndriySvyryd New version up that runs validation as part of FinalizeModel when the ModelBuilder is constructed externally to the context. |
| @@ -59,7 +59,7 @@ protected virtual IConventionSetBuilder CreateConventionSetBuilder(DbContext con | |||
|
|
|||
| protected virtual void Validate(ModelBuilder modelBuilder) | |||
| { | |||
| modelBuilder.GetInfrastructure().Metadata.Validate(); | |||
| modelBuilder.FinalizeModel(); | |||
| var context = CreateContext(); | |||
| context.GetService<IModelValidator>().Validate(modelBuilder.Model); | |||
There was a problem hiding this comment.
All other calls to IModelValidator.Validate() should be removed
ajcvickers
force-pushed
the
OutOfContext0930
branch
2 times, most recently
from
88499e4 to
67f08ad
Compare
|
|
||
| Dependencies.ModelCustomizer.Customize(modelBuilder, context); | ||
|
|
||
| _onModelCreating(modelBuilder, context); | ||
|
|
||
| model.Validate(); | ||
| modelBuilder.FinalizeModel(); | ||
|
|
||
| validator.Validate(model); |
There was a problem hiding this comment.
This one is still needed. The TestModelSource doesn't add the validator as a convention. It's only when the ModelBuilder is created externally from the context using the static CreateConventionSet method that the validator is added as a convention.
|
|
||
| Dependencies.ModelCustomizer.Customize(modelBuilder, context); | ||
|
|
||
| model.Validate(); | ||
| modelBuilder.FinalizeModel(); | ||
|
|
||
| validator.Validate(model); |
There was a problem hiding this comment.
And search for other usages
ajcvickers
force-pushed
the
OutOfContext0930
branch
from
67f08ad to
b6790b4
Compare
|
@AndriySvyryd New version |
| @@ -76,18 +75,15 @@ public virtual IModel GetModel(DbContext context, IConventionSetBuilder conventi | |||
| Check.NotNull(validator, nameof(validator)); | |||
|
|
|||
| var conventionSet = CreateConventionSet(conventionSetBuilder); | |||
| conventionSet.ModelBuiltConventions.Add(new ValidatingConvention(validator)); | |||
There was a problem hiding this comment.
Move this to CreateConventionSet
… the context Fixes #11738 Naming to be discussed. This runs the model-based conventions and model validation. Also moved setting or product version annotation to any use of the ModelBuilder and then removed from places in the tests that this would cause problems when the version changes.
ajcvickers
force-pushed
the
OutOfContext0930
branch
from
b6790b4 to
ca907db
Compare
Fixes #11738
Naming to be discussed.
This runs the model-based conventions, and model validation. Also moved setting or product version annotation to any use of the ModelBuilder and then removed from places in the tests that this would cause problems when the version changes.