Skip to content

Fix CollectionUsers/CollectionGroups table names for Seeder across all DB providers #7441

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
theMickster merged 3 commits into from
Apr 13, 2026
+17 −4
Merged

Fix CollectionUsers/CollectionGroups table names for Seeder across all DB providers #7441

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5613cf9
Fix CollectionUser and CollectionGroup table names across all DB prov…
mimartin12 Apr 10, 2026
e6d003b
Correct comment accuracy
mimartin12 Apr 10, 2026
364896f
Merge branch 'main' into fix/seeder-postgres
mimartin12 Apr 10, 2026
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
21 changes: 17 additions & 4 deletions util/Seeder/Pipeline/BulkCommitter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
using Bit.Infrastructure.EntityFramework.Repositories;
using LinqToDB.Data;
using LinqToDB.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore;
using EfCollection = Bit.Infrastructure.EntityFramework.Models.Collection;
using EfCollectionGroup = Bit.Infrastructure.EntityFramework.Models.CollectionGroup;
using EfCollectionUser = Bit.Infrastructure.EntityFramework.Models.CollectionUser;
Expand All @@ -25,8 +26,9 @@ namespace Bit.Seeder.Pipeline;
/// Each list is cleared after insert so the context is ready for the next pipeline run.
///
/// CollectionUser and CollectionGroup require an explicit table name in BulkCopyOptions because
/// they lack both IEntityTypeConfiguration and .ToTable() mappings in DatabaseContext, so LinqToDB
/// cannot resolve their table names automatically.
/// they lack .ToTable() mappings in DatabaseContext, so LinqToDB cannot resolve their table names
/// automatically. Table names vary by provider — SQL Server uses singular names while EF Core-managed
/// providers use pluralized names.
/// </remarks>
/// <seealso cref="SeederContext"/>
/// <seealso cref="RecipeExecutor"/>
Expand All @@ -48,9 +50,11 @@ internal void Commit(SeederContext context)

MapCopyAndClear<Core.Entities.Collection, EfCollection>(context.Collections);

MapCopyAndClear<Core.Entities.CollectionUser, EfCollectionUser>(context.CollectionUsers, nameof(Core.Entities.CollectionUser));
MapCopyAndClear<Core.Entities.CollectionUser, EfCollectionUser>(context.CollectionUsers,
GetTableName<EfCollectionUser>());

MapCopyAndClear<Core.Entities.CollectionGroup, EfCollectionGroup>(context.CollectionGroups, nameof(Core.Entities.CollectionGroup));
MapCopyAndClear<Core.Entities.CollectionGroup, EfCollectionGroup>(context.CollectionGroups,
GetTableName<EfCollectionGroup>());

MapCopyAndClear<Core.Vault.Entities.Folder, EfFolder>(context.Folders);

Expand All @@ -59,6 +63,15 @@ internal void Commit(SeederContext context)
CopyAndClear(context.CollectionCiphers);
}

/// <summary>
/// Resolves the table name for an EF entity type from the EF Core model,
/// falling back to the C# class name for SQL Server.
/// </summary>
private string? GetTableName<TEf>() where TEf : class =>
db.Database.IsSqlServer()
? typeof(TEf).Name
: db.Model.FindEntityType(typeof(TEf))?.GetTableName();

private void MapCopyAndClear<TCore, TEf>(List<TCore> entities, string? tableName = null) where TEf : class
{
if (entities.Count is 0)
Expand Down
Loading