diff --git a/src/EFCore.PG/Design/Internal/NpgsqlAnnotationCodeGenerator.cs b/src/EFCore.PG/Design/Internal/NpgsqlAnnotationCodeGenerator.cs index 40d5f17dfd..2ac672cf85 100644 --- a/src/EFCore.PG/Design/Internal/NpgsqlAnnotationCodeGenerator.cs +++ b/src/EFCore.PG/Design/Internal/NpgsqlAnnotationCodeGenerator.cs @@ -212,7 +212,7 @@ public override IReadOnlyList GenerateFluentApiCalls( { var fragments = new List(base.GenerateFluentApiCalls(model, annotations)); - if (GenerateValueGenerationStrategy(annotations, onModel: true) is { } valueGenerationStrategy) + if (GenerateValueGenerationStrategy(annotations, model, onModel: true) is { } valueGenerationStrategy) { fragments.Add(valueGenerationStrategy); } @@ -307,7 +307,7 @@ public override IReadOnlyList GenerateFluentApiCalls( { var fragments = new List(base.GenerateFluentApiCalls(property, annotations)); - if (GenerateValueGenerationStrategy(annotations, onModel: false) is { } valueGenerationStrategy) + if (GenerateValueGenerationStrategy(annotations, property.DeclaringType.Model, onModel: false) is { } valueGenerationStrategy) { fragments.Add(valueGenerationStrategy); } @@ -320,7 +320,10 @@ public override IReadOnlyList GenerateFluentApiCalls( return fragments; } - private MethodCallCodeFragment? GenerateValueGenerationStrategy(IDictionary annotations, bool onModel) + private MethodCallCodeFragment? GenerateValueGenerationStrategy( + IDictionary annotations, + IModel model, + bool onModel) { if (!TryGetAndRemove(annotations, NpgsqlAnnotationNames.ValueGenerationStrategy, out NpgsqlValueGenerationStrategy strategy)) { @@ -342,8 +345,10 @@ public override IReadOnlyList GenerateFluentApiCalls( case NpgsqlValueGenerationStrategy.SequenceHiLo: { - var name = GetAndRemove(NpgsqlAnnotationNames.HiLoSequenceName)!; - var schema = GetAndRemove(NpgsqlAnnotationNames.HiLoSequenceSchema); + var name = GetAndRemove(NpgsqlAnnotationNames.HiLoSequenceName) + ?? (onModel ? null : model.GetHiLoSequenceName()); + var schema = GetAndRemove(NpgsqlAnnotationNames.HiLoSequenceSchema) + ?? (onModel ? null : model.GetHiLoSequenceSchema()); return new MethodCallCodeFragment( onModel ? ModelUseHiLoMethodInfo : PropertyUseHiLoMethodInfo, (name, schema) switch diff --git a/test/EFCore.PG.Tests/Design/Internal/NpgsqlAnnotationCodeGeneratorTest.cs b/test/EFCore.PG.Tests/Design/Internal/NpgsqlAnnotationCodeGeneratorTest.cs index ec9cff9863..b3678074b1 100644 --- a/test/EFCore.PG.Tests/Design/Internal/NpgsqlAnnotationCodeGeneratorTest.cs +++ b/test/EFCore.PG.Tests/Design/Internal/NpgsqlAnnotationCodeGeneratorTest.cs @@ -197,6 +197,7 @@ public void GenerateFluentApi_IProperty_works_with_HiLo() { var generator = CreateGenerator(); var modelBuilder = new ModelBuilder(NpgsqlConventionSetBuilder.Build()); + modelBuilder.UseHiLo("ModelHiLoIndexName", "ModelHiLoIndexSchema"); modelBuilder.Entity("Post", x => x.Property("Id").UseHiLo("HiLoIndexName", "HiLoIndexSchema")); var property = (IProperty)modelBuilder.Model.FindEntityType("Post").FindProperty("Id"); @@ -212,6 +213,31 @@ public void GenerateFluentApi_IProperty_works_with_HiLo() schema => Assert.Equal("HiLoIndexSchema", schema)); } + [ConditionalTheory] + [InlineData(null, null)] + [InlineData("HiLoIndexName", null)] + [InlineData(null, "HiLoIndexSchema")] + [InlineData("HiLoIndexName", "HiLoIndexSchema")] + public void GenerateFluentApi_IProperty_works_with_inherited_HiLo(string name, string schema) + { + var generator = CreateGenerator(); + var modelBuilder = new ModelBuilder(NpgsqlConventionSetBuilder.Build()); + modelBuilder.UseHiLo(name, schema); + modelBuilder.Entity("Post", x => x.Property("Id")); + var property = modelBuilder.FinalizeModel().FindEntityType("Post").FindProperty("Id"); + + var annotations = property.GetAnnotations().ToDictionary(a => a.Name, a => a); + var result = generator.GenerateFluentApiCalls(property, annotations).Single(); + + Assert.Equal("UseHiLo", result.Method); + Assert.Equal("NpgsqlPropertyBuilderExtensions", result.DeclaringType); + + object[] expectedArguments = schema is null + ? [name ?? NpgsqlModelExtensions.DefaultHiLoSequenceName] + : [name ?? NpgsqlModelExtensions.DefaultHiLoSequenceName, schema]; + Assert.Equal(expectedArguments, result.Arguments); + } + #endregion Identity / sequence / HiLo #region PostgreSQL extensions