Skip to content

Fix identity column handling for generated GUIDs on SQL server and ad… #54

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PhenX merged 1 commit into from
Jun 4, 2025
Merged

Fix identity column handling for generated GUIDs on SQL server and ad… #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/PhenX.EntityFrameworkCore.BulkInsert.SqlServer/SqlServerDialectBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ public override string BuildMoveDataSql<T>(
{
var q = new StringBuilder();

if (options.CopyGeneratedColumns)
var identityInsert = options.CopyGeneratedColumns && insertedColumns.Any(x => x.IsGenerated);
if (identityInsert)
{
q.AppendLine($"SET IDENTITY_INSERT {target.QuotedTableName} ON;");
}
Expand Down Expand Up @@ -129,7 +130,7 @@ public override string BuildMoveDataSql<T>(

q.AppendLine(";");

if (options.CopyGeneratedColumns)
if (identityInsert)
{
q.AppendLine($"SET IDENTITY_INSERT {target.QuotedTableName} OFF;");
}
Expand Down
2 changes: 1 addition & 1 deletion src/PhenX.EntityFrameworkCore.BulkInsert/Metadata/ColumnMetadata.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ internal sealed class ColumnMetadata(IProperty property, SqlDialectBuilder dial

public Type ClrType { get; } = property.ClrType;

public bool IsGenerated { get; } = property.ValueGenerated == ValueGenerated.OnAdd;
public bool IsGenerated { get; } = property.ValueGenerated != ValueGenerated.Never;

public object? GetValue(object entity, BulkInsertOptions options)
{
Expand Down
18 changes: 0 additions & 18 deletions tests/PhenX.EntityFrameworkCore.BulkInsert.Tests/DbContext/TestEntityWithGeneratedGuidId.cs
View file
Open in desktop

This file was deleted.

22 changes: 22 additions & 0 deletions tests/PhenX.EntityFrameworkCore.BulkInsert.Tests/Tests/Basic/BasicTestsBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,4 +261,26 @@ await _context.ExecuteBulkInsertAsync(entities, (SqlServerBulkInsertOptions _) =
}));
}
}

[SkippableTheory]
[CombinatorialData]
public async Task InsertEntities_WithGeneratedGuidId(InsertStrategy strategy)
{
// Arrange
var entities = new List<TestEntityWithGuidId>
{
new TestEntityWithGuidId { Id = Guid.NewGuid(), Name = $"{_run}_Entity1" },
new TestEntityWithGuidId { Id = Guid.NewGuid(), Name = $"{_run}_Entity2" }
};

// Act
var insertedEntities = await _context.InsertWithStrategyAsync(strategy, entities, configure => configure.CopyGeneratedColumns = true);

// Assert
insertedEntities.Should().BeEquivalentTo(entities,
o=> o
.RespectingRuntimeTypes()
.Excluding(e => e.Id)
);
}
}