diff --git a/src/EFCore.Design/Design/OperationExecutor.cs b/src/EFCore.Design/Design/OperationExecutor.cs index 8112a3ee949..b85daba714c 100644 --- a/src/EFCore.Design/Design/OperationExecutor.cs +++ b/src/EFCore.Design/Design/OperationExecutor.cs @@ -488,10 +488,10 @@ private IEnumerable GetMigrationsImpl( /// /// Represents an operation to generate a compiled model from the DbContext. /// - public class Optimize : OperationBase + public class OptimizeContext : OperationBase { /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// The arguments supported by are: /// outputDir--The directory to put files in. Paths are relative to the project directory. /// modelNamespace--Specify to override the namespace of the generated model. @@ -500,7 +500,7 @@ public class Optimize : OperationBase /// The operation executor. /// The . /// The operation arguments. - public Optimize( + public OptimizeContext( OperationExecutor executor, IOperationResultHandler resultHandler, IDictionary args) @@ -513,11 +513,11 @@ public Optimize( var modelNamespace = (string?)args["modelNamespace"]; var contextType = (string?)args["contextType"]; - Execute(() => executor.OptimizeImpl(outputDir, modelNamespace, contextType)); + Execute(() => executor.OptimizeContextImpl(outputDir, modelNamespace, contextType)); } } - private void OptimizeImpl(string? outputDir, string? modelNamespace, string? contextType) + private void OptimizeContextImpl(string? outputDir, string? modelNamespace, string? contextType) => ContextOperations.Optimize(outputDir, modelNamespace, contextType); /// diff --git a/src/EFCore.InMemory/Infrastructure/InMemoryDbContextOptionsBuilder.cs b/src/EFCore.InMemory/Infrastructure/InMemoryDbContextOptionsBuilder.cs index d9094d30cd8..36f7d0aa4e5 100644 --- a/src/EFCore.InMemory/Infrastructure/InMemoryDbContextOptionsBuilder.cs +++ b/src/EFCore.InMemory/Infrastructure/InMemoryDbContextOptionsBuilder.cs @@ -46,14 +46,14 @@ DbContextOptionsBuilder IInMemoryDbContextOptionsBuilderInfrastructure.OptionsBu /// Enables nullability check for all properties across all entities within the in-memory database. /// /// - /// If , then nullability check is enforced. + /// If , then nullability check is enforced. /// The same builder instance so that multiple calls can be chained. - public virtual InMemoryDbContextOptionsBuilder EnableNullabilityCheck(bool nullabilityCheckEnabled = true) + public virtual InMemoryDbContextOptionsBuilder EnableNullChecks(bool nullChecksEnabled = true) { var extension = OptionsBuilder.Options.FindExtension() ?? new InMemoryOptionsExtension(); - extension = extension.WithNullabilityCheckEnabled(nullabilityCheckEnabled); + extension = extension.WithNullabilityCheckEnabled(nullChecksEnabled); ((IDbContextOptionsBuilderInfrastructure)OptionsBuilder).AddOrUpdateExtension(extension); diff --git a/src/EFCore.Relational/Query/RelationalCollectionShaperExpression.cs b/src/EFCore.Relational/Query/RelationalCollectionShaperExpression.cs index d6c14ca0078..f4264ed8a81 100644 --- a/src/EFCore.Relational/Query/RelationalCollectionShaperExpression.cs +++ b/src/EFCore.Relational/Query/RelationalCollectionShaperExpression.cs @@ -135,7 +135,7 @@ public RelationalCollectionShaperExpression( /// A unique id for this collection shaper. /// [Obsolete("CollectionId are not stored in shaper anymore. Shaper compiler assigns it as needed.")] - public virtual int? CollectionId { get; } + public virtual int CollectionId { get; } /// /// The identifier for the parent element. diff --git a/src/EFCore.Relational/Query/RelationalSplitCollectionShaperExpression.cs b/src/EFCore.Relational/Query/RelationalSplitCollectionShaperExpression.cs index ac5fc0bf2d1..c120cfd4007 100644 --- a/src/EFCore.Relational/Query/RelationalSplitCollectionShaperExpression.cs +++ b/src/EFCore.Relational/Query/RelationalSplitCollectionShaperExpression.cs @@ -99,7 +99,7 @@ public RelationalSplitCollectionShaperExpression( /// A unique id for this collection shaper. /// [Obsolete("CollectionId are not stored in shaper anymore. Shaper compiler assigns it as needed.")] - public virtual int? CollectionId { get; } + public virtual int CollectionId { get; } /// /// The identifier for the parent element. diff --git a/src/ef/Commands/DbContextOptimizeCommand.cs b/src/ef/Commands/DbContextOptimizeCommand.cs index d8230e93db3..a34c2afa563 100644 --- a/src/ef/Commands/DbContextOptimizeCommand.cs +++ b/src/ef/Commands/DbContextOptimizeCommand.cs @@ -9,7 +9,7 @@ internal partial class DbContextOptimizeCommand protected override int Execute(string[] args) { using var executor = CreateExecutor(args); - executor.Optimize( + executor.OptimizeContext( _outputDir!.Value(), _namespace!.Value(), Context!.Value()); diff --git a/src/ef/IOperationExecutor.cs b/src/ef/IOperationExecutor.cs index 61bf63be8c3..71acd02e51a 100644 --- a/src/ef/IOperationExecutor.cs +++ b/src/ef/IOperationExecutor.cs @@ -16,7 +16,7 @@ internal interface IOperationExecutor : IDisposable IDictionary GetContextInfo(string? name); void UpdateDatabase(string? migration, string? connectionString, string? contextType); IEnumerable GetContextTypes(); - void Optimize(string? outputDir, string? modelNamespace, string? contextType); + void OptimizeContext(string? outputDir, string? modelNamespace, string? contextType); IDictionary ScaffoldContext( string provider, diff --git a/src/ef/OperationExecutorBase.cs b/src/ef/OperationExecutorBase.cs index f2117d78067..feac1c372e4 100644 --- a/src/ef/OperationExecutorBase.cs +++ b/src/ef/OperationExecutorBase.cs @@ -140,9 +140,9 @@ public void UpdateDatabase(string? migration, string? connectionString, string? public IEnumerable GetContextTypes() => InvokeOperation>("GetContextTypes"); - public void Optimize(string? outputDir, string? modelNamespace, string? contextType) + public void OptimizeContext(string? outputDir, string? modelNamespace, string? contextType) => InvokeOperation( - "Optimize", + "OptimizeContext", new Dictionary { ["outputDir"] = outputDir, diff --git a/test/EFCore.InMemory.FunctionalTests/NullabilityCheckInMemoryTest.cs b/test/EFCore.InMemory.FunctionalTests/NullabilityCheckInMemoryTest.cs index 4c2c4560253..23c6373626e 100644 --- a/test/EFCore.InMemory.FunctionalTests/NullabilityCheckInMemoryTest.cs +++ b/test/EFCore.InMemory.FunctionalTests/NullabilityCheckInMemoryTest.cs @@ -31,7 +31,7 @@ public void IsRequired_for_property_throws_while_inserting_null_value() var optionsBuilder = new DbContextOptionsBuilder() .UseModel(modelBuilder.FinalizeModel()) - .UseInMemoryDatabase(nameof(NullabilityCheckInMemoryTest), b => b.EnableNullabilityCheck()) + .UseInMemoryDatabase(nameof(NullabilityCheckInMemoryTest), b => b.EnableNullChecks()) .UseInternalServiceProvider(Fixture.ServiceProvider); using var context = new DbContext(optionsBuilder.Options); @@ -53,7 +53,7 @@ public void IsRequired_for_property_throws_while_inserting_null_value_sensitive( var optionsBuilder = new DbContextOptionsBuilder() .UseModel(modelBuilder.FinalizeModel()) - .UseInMemoryDatabase(nameof(NullabilityCheckInMemoryTest), b => b.EnableNullabilityCheck()) + .UseInMemoryDatabase(nameof(NullabilityCheckInMemoryTest), b => b.EnableNullChecks()) .UseInternalServiceProvider(InMemoryFixture.DefaultNullabilitySensitiveCheckProvider) .EnableSensitiveDataLogging(); @@ -80,7 +80,7 @@ public void IsRequired_for_property_throws_while_inserting_null_value_sensitive_ var optionsBuilder = new DbContextOptionsBuilder() .UseModel(modelBuilder.FinalizeModel()) - .UseInMemoryDatabase(nameof(NullabilityCheckInMemoryTest), b => b.EnableNullabilityCheck()) + .UseInMemoryDatabase(nameof(NullabilityCheckInMemoryTest), b => b.EnableNullChecks()) .UseInternalServiceProvider(InMemoryFixture.DefaultNullabilitySensitiveCheckProvider) .EnableSensitiveDataLogging(); @@ -103,7 +103,7 @@ public void RequiredAttribute_for_property_throws_while_inserting_null_value() var optionsBuilder = new DbContextOptionsBuilder() .UseModel(modelBuilder.FinalizeModel()) - .UseInMemoryDatabase(nameof(NullabilityCheckInMemoryTest), b => b.EnableNullabilityCheck()) + .UseInMemoryDatabase(nameof(NullabilityCheckInMemoryTest), b => b.EnableNullChecks()) .UseInternalServiceProvider(Fixture.ServiceProvider); using var context = new DbContext(optionsBuilder.Options); @@ -127,7 +127,7 @@ public void RequiredAttribute_And_IsRequired_for_properties_throws_while_inserti var optionsBuilder = new DbContextOptionsBuilder() .UseModel(modelBuilder.FinalizeModel()) - .UseInMemoryDatabase(nameof(NullabilityCheckInMemoryTest), b => b.EnableNullabilityCheck()) + .UseInMemoryDatabase(nameof(NullabilityCheckInMemoryTest), b => b.EnableNullChecks()) .UseInternalServiceProvider(Fixture.ServiceProvider); using var context = new DbContext(optionsBuilder.Options); @@ -144,7 +144,7 @@ public void Can_insert_null_value_with_IsRequired_for_property_if_nullability_ch var optionsBuilder = new DbContextOptionsBuilder() .UseModel(modelBuilder.FinalizeModel()) - .UseInMemoryDatabase(Guid.NewGuid().ToString(), b => b.EnableNullabilityCheck(false)) + .UseInMemoryDatabase(Guid.NewGuid().ToString(), b => b.EnableNullChecks(false)) .UseInternalServiceProvider(InMemoryFixture.DefaultNullabilityCheckProvider); using var context = new DbContext(optionsBuilder.Options); @@ -162,7 +162,7 @@ public void Can_insert_null_value_with_RequiredAttribute_for_property_if_nullabi var optionsBuilder = new DbContextOptionsBuilder() .UseModel(modelBuilder.FinalizeModel()) - .UseInMemoryDatabase(nameof(NullabilityCheckInMemoryTest), b => b.EnableNullabilityCheck(false)) + .UseInMemoryDatabase(nameof(NullabilityCheckInMemoryTest), b => b.EnableNullChecks(false)) .UseInternalServiceProvider(InMemoryFixture.DefaultNullabilityCheckProvider); using var context = new DbContext(optionsBuilder.Options); @@ -180,7 +180,7 @@ public void Can_insert_null_values_with_RequiredAttribute_and_IsRequired_for_pro var optionsBuilder = new DbContextOptionsBuilder() .UseModel(modelBuilder.FinalizeModel()) - .UseInMemoryDatabase(nameof(NullabilityCheckInMemoryTest), b => b.EnableNullabilityCheck(false)) + .UseInMemoryDatabase(nameof(NullabilityCheckInMemoryTest), b => b.EnableNullChecks(false)) .UseInternalServiceProvider(InMemoryFixture.DefaultNullabilityCheckProvider); using var context = new DbContext(optionsBuilder.Options); diff --git a/test/EFCore.InMemory.Tests/ModelBuilding/InMemoryModelBuilderGenericTest.cs b/test/EFCore.InMemory.Tests/ModelBuilding/InMemoryModelBuilderGenericTest.cs index 007f060b5ba..72848eba94b 100644 --- a/test/EFCore.InMemory.Tests/ModelBuilding/InMemoryModelBuilderGenericTest.cs +++ b/test/EFCore.InMemory.Tests/ModelBuilding/InMemoryModelBuilderGenericTest.cs @@ -46,7 +46,7 @@ public virtual void Can_use_self_referencing_overlapping_FK_PK() var contextOptions = new DbContextOptionsBuilder() .UseModel(modelBuilder.Model.FinalizeModel()) .UseInternalServiceProvider(InMemoryFixture.DefaultNullabilityCheckProvider) - .UseInMemoryDatabase("Can_use_self_referencing_overlapping_FK_PK", b => b.EnableNullabilityCheck(false)) + .UseInMemoryDatabase("Can_use_self_referencing_overlapping_FK_PK", b => b.EnableNullChecks(false)) .Options; using (var context = new DbContext(contextOptions))