Skip to content

Commit 1616814

Browse files
rojiWhatzGames
authored andcommitted
Rename NpgsqlUuid7ValueGenerator to NpgsqlSequentialGuidValueGenerator and make it public (npgsql#3255)
Follow-up to npgsql#3249
1 parent 412ff37 commit 1616814

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

src/EFCore.PG/ValueGeneration/Internal/NpgsqlValueGeneratorSelector.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,6 @@ public override bool TrySelect(IProperty property, ITypeBase typeBase, out Value
104104
=> property.ClrType.UnwrapNullableType() == typeof(Guid)
105105
? property.ValueGenerated == ValueGenerated.Never || property.GetDefaultValueSql() is not null
106106
? new TemporaryGuidValueGenerator()
107-
: new NpgsqlUuid7ValueGenerator()
107+
: new NpgsqlSequentialGuidValueGenerator()
108108
: base.FindForType(property, typeBase, clrType);
109109
}

src/EFCore.PG/ValueGeneration/Internal/NpgsqlUuid7ValueGenerator.cs renamed to src/EFCore.PG/ValueGeneration/NpgsqlSequentialGuidValueGenerator.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
using System.Runtime.CompilerServices;
22
using System.Runtime.InteropServices;
33

4-
namespace Npgsql.EntityFrameworkCore.PostgreSQL.ValueGeneration.Internal;
4+
namespace Npgsql.EntityFrameworkCore.PostgreSQL.ValueGeneration;
55

66
/// <summary>
77
/// This API supports the Entity Framework Core infrastructure and is not intended to be used
88
/// directly from your code. This API may change or be removed in future releases.
99
/// </summary>
10-
public class NpgsqlUuid7ValueGenerator : ValueGenerator<Guid>
10+
public class NpgsqlSequentialGuidValueGenerator : ValueGenerator<Guid>
1111
{
1212
/// <summary>
1313
/// This API supports the Entity Framework Core infrastructure and is not intended to be used

test/EFCore.PG.Tests/NpgsqlValueGeneratorSelectorTest.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using System.ComponentModel.DataAnnotations.Schema;
22
using Microsoft.EntityFrameworkCore.ValueGeneration.Internal;
33
using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities;
4+
using Npgsql.EntityFrameworkCore.PostgreSQL.ValueGeneration;
45
using Npgsql.EntityFrameworkCore.PostgreSQL.ValueGeneration.Internal;
56

67
namespace Npgsql.EntityFrameworkCore.PostgreSQL;
@@ -21,7 +22,7 @@ public void Returns_built_in_generators_for_types_setup_for_value_generation()
2122
AssertGenerator<TemporaryByteValueGenerator>("NullableByte");
2223
AssertGenerator<TemporaryDecimalValueGenerator>("Decimal");
2324
AssertGenerator<StringValueGenerator>("String");
24-
AssertGenerator<NpgsqlUuid7ValueGenerator>("Guid");
25+
AssertGenerator<NpgsqlSequentialGuidValueGenerator>("Guid");
2526
AssertGenerator<BinaryValueGenerator>("Binary");
2627
}
2728

@@ -128,7 +129,7 @@ public void Returns_sequence_value_generators_when_configured_for_model()
128129
AssertGenerator<NpgsqlSequenceHiLoValueGenerator<long>>("NullableLong", setSequences: true);
129130
AssertGenerator<NpgsqlSequenceHiLoValueGenerator<short>>("NullableShort", setSequences: true);
130131
AssertGenerator<StringValueGenerator>("String", setSequences: true);
131-
AssertGenerator<NpgsqlUuid7ValueGenerator>("Guid", setSequences: true);
132+
AssertGenerator<NpgsqlSequentialGuidValueGenerator>("Guid", setSequences: true);
132133
AssertGenerator<BinaryValueGenerator>("Binary", setSequences: true);
133134
}
134135

@@ -216,7 +217,7 @@ public void NpgsqlUuid7ValueGenerator_creates_uuidv7()
216217
{
217218
var dtoNow = DateTimeOffset.UtcNow;
218219
var net9Internal = Guid.CreateVersion7(dtoNow);
219-
var custom = NpgsqlUuid7ValueGenerator.BorrowedFromNet9.CreateVersion7(dtoNow);
220+
var custom = NpgsqlSequentialGuidValueGenerator.BorrowedFromNet9.CreateVersion7(dtoNow);
220221
var bytenet9 = net9Internal.ToByteArray().AsSpan(0, 6);
221222
var bytecustom = custom.ToByteArray().AsSpan(0, 6);
222223
Assert.Equal(bytenet9, bytecustom);

0 commit comments

Comments
 (0)