diff --git a/src/EFCore.PG/ValueGeneration/Internal/NpgsqlValueGeneratorSelector.cs b/src/EFCore.PG/ValueGeneration/Internal/NpgsqlValueGeneratorSelector.cs index 2f5665be8..a9274f617 100644 --- a/src/EFCore.PG/ValueGeneration/Internal/NpgsqlValueGeneratorSelector.cs +++ b/src/EFCore.PG/ValueGeneration/Internal/NpgsqlValueGeneratorSelector.cs @@ -104,6 +104,6 @@ public override bool TrySelect(IProperty property, ITypeBase typeBase, out Value => property.ClrType.UnwrapNullableType() == typeof(Guid) ? property.ValueGenerated == ValueGenerated.Never || property.GetDefaultValueSql() is not null ? new TemporaryGuidValueGenerator() - : new NpgsqlUuid7ValueGenerator() + : new NpgsqlSequentialGuidValueGenerator() : base.FindForType(property, typeBase, clrType); } diff --git a/src/EFCore.PG/ValueGeneration/Internal/NpgsqlUuid7ValueGenerator.cs b/src/EFCore.PG/ValueGeneration/NpgsqlSequentialGuidValueGenerator.cs similarity index 97% rename from src/EFCore.PG/ValueGeneration/Internal/NpgsqlUuid7ValueGenerator.cs rename to src/EFCore.PG/ValueGeneration/NpgsqlSequentialGuidValueGenerator.cs index 16fee666f..69d90f4f1 100644 --- a/src/EFCore.PG/ValueGeneration/Internal/NpgsqlUuid7ValueGenerator.cs +++ b/src/EFCore.PG/ValueGeneration/NpgsqlSequentialGuidValueGenerator.cs @@ -1,13 +1,13 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -namespace Npgsql.EntityFrameworkCore.PostgreSQL.ValueGeneration.Internal; +namespace Npgsql.EntityFrameworkCore.PostgreSQL.ValueGeneration; /// /// This API supports the Entity Framework Core infrastructure and is not intended to be used /// directly from your code. This API may change or be removed in future releases. /// -public class NpgsqlUuid7ValueGenerator : ValueGenerator +public class NpgsqlSequentialGuidValueGenerator : ValueGenerator { /// /// This API supports the Entity Framework Core infrastructure and is not intended to be used diff --git a/test/EFCore.PG.Tests/NpgsqlValueGeneratorSelectorTest.cs b/test/EFCore.PG.Tests/NpgsqlValueGeneratorSelectorTest.cs index 0d95b24e8..57b0d1b9a 100644 --- a/test/EFCore.PG.Tests/NpgsqlValueGeneratorSelectorTest.cs +++ b/test/EFCore.PG.Tests/NpgsqlValueGeneratorSelectorTest.cs @@ -1,6 +1,7 @@ using System.ComponentModel.DataAnnotations.Schema; using Microsoft.EntityFrameworkCore.ValueGeneration.Internal; using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities; +using Npgsql.EntityFrameworkCore.PostgreSQL.ValueGeneration; using Npgsql.EntityFrameworkCore.PostgreSQL.ValueGeneration.Internal; namespace Npgsql.EntityFrameworkCore.PostgreSQL; @@ -21,7 +22,7 @@ public void Returns_built_in_generators_for_types_setup_for_value_generation() AssertGenerator("NullableByte"); AssertGenerator("Decimal"); AssertGenerator("String"); - AssertGenerator("Guid"); + AssertGenerator("Guid"); AssertGenerator("Binary"); } @@ -128,7 +129,7 @@ public void Returns_sequence_value_generators_when_configured_for_model() AssertGenerator>("NullableLong", setSequences: true); AssertGenerator>("NullableShort", setSequences: true); AssertGenerator("String", setSequences: true); - AssertGenerator("Guid", setSequences: true); + AssertGenerator("Guid", setSequences: true); AssertGenerator("Binary", setSequences: true); } @@ -216,7 +217,7 @@ public void NpgsqlUuid7ValueGenerator_creates_uuidv7() { var dtoNow = DateTimeOffset.UtcNow; var net9Internal = Guid.CreateVersion7(dtoNow); - var custom = NpgsqlUuid7ValueGenerator.BorrowedFromNet9.CreateVersion7(dtoNow); + var custom = NpgsqlSequentialGuidValueGenerator.BorrowedFromNet9.CreateVersion7(dtoNow); var bytenet9 = net9Internal.ToByteArray().AsSpan(0, 6); var bytecustom = custom.ToByteArray().AsSpan(0, 6); Assert.Equal(bytenet9, bytecustom);