Skip to content

[PM-34828] Fix BW lite sqlite bulk import failure for org imports #7468

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

Open
mimartin12 wants to merge 4 commits into
base: main
Choose a base branch
from
Open

[PM-34828] Fix BW lite sqlite bulk import failure for org imports #7468

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1a74cd2
Fix SQLite bulk copy failure for org accounts
mimartin12 Apr 8, 2026
559452e
Fix SQLite bulk copy failure for cipher imports
mimartin12 Apr 8, 2026
c3d1fa0
Add comments explaining SQLite BulkCopy guards
mimartin12 Apr 14, 2026
0c7941e
Add missing await dbContext.SaveChangesAsync()
mimartin12 Apr 21, 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
12 changes: 11 additions & 1 deletion src/Infrastructure.EntityFramework/Dirt/Repositories/EventRepository.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,17 @@ public async Task CreateManyAsync(IEnumerable<IEvent> entities)
var tableEvents = entities.Select(e => e as Core.Entities.Event ?? new Core.Entities.Event(e));
var entityEvents = Mapper.Map<List<Event>>(tableEvents);
entityEvents.ForEach(e => e.SetNewId());
await dbContext.BulkCopyAsync(entityEvents);
// SQLite does not support LinqToDB BulkCopy; use EF Core directly instead
if (dbContext.Database.IsSqlite())
{
await dbContext.AddRangeAsync(entityEvents);
await dbContext.SaveChangesAsync();
}
else
{
await dbContext.BulkCopyAsync(entityEvents);
await dbContext.SaveChangesAsync();
}
Comment thread
Banrion marked this conversation as resolved.
}
}

Expand Down
61 changes: 45 additions & 16 deletions src/Infrastructure.EntityFramework/Vault/Repositories/CipherRepository.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,9 +159,18 @@ public async Task CreateAsync(Guid userId, IEnumerable<Core.Vault.Entities.Ciphe
{
var dbContext = GetDatabaseContext(scope);
var folderEntities = Mapper.Map<List<Folder>>(folders);
await dbContext.BulkCopyAsync(base.DefaultBulkCopyOptions, folderEntities);
var cipherEntities = Mapper.Map<List<Cipher>>(ciphers);
await dbContext.BulkCopyAsync(base.DefaultBulkCopyOptions, cipherEntities);
// SQLite does not support LinqToDB BulkCopy; use EF Core directly instead
if (dbContext.Database.IsSqlite())
{
await dbContext.AddRangeAsync(folderEntities);
await dbContext.AddRangeAsync(cipherEntities);
}
else
{
await dbContext.BulkCopyAsync(base.DefaultBulkCopyOptions, folderEntities);
await dbContext.BulkCopyAsync(base.DefaultBulkCopyOptions, cipherEntities);
}
await dbContext.UserBumpAccountRevisionDateAsync(userId);

await dbContext.SaveChangesAsync();
Expand All @@ -181,24 +190,44 @@ public async Task CreateAsync(IEnumerable<Core.Vault.Entities.Cipher> ciphers,
{
var dbContext = GetDatabaseContext(scope);
var cipherEntities = Mapper.Map<List<Cipher>>(ciphers);
await dbContext.BulkCopyAsync(base.DefaultBulkCopyOptions, cipherEntities);

if (collections.Any())
// SQLite does not support LinqToDB BulkCopy; use EF Core directly instead
if (dbContext.Database.IsSqlite())
{
var collectionEntities = Mapper.Map<List<Collection>>(collections);
await dbContext.BulkCopyAsync(base.DefaultBulkCopyOptions, collectionEntities);
await dbContext.AddRangeAsync(cipherEntities);
if (collections.Any())
{
await dbContext.AddRangeAsync(Mapper.Map<List<Collection>>(collections));
}
if (collectionCiphers.Any())
{
await dbContext.AddRangeAsync(Mapper.Map<List<CollectionCipher>>(collectionCiphers));
}
if (collectionUsers.Any())
{
await dbContext.AddRangeAsync(Mapper.Map<List<CollectionUser>>(collectionUsers));
}
}

if (collectionCiphers.Any())
else
{
var collectionCipherEntities = Mapper.Map<List<CollectionCipher>>(collectionCiphers);
await dbContext.BulkCopyAsync(base.DefaultBulkCopyOptions, collectionCipherEntities);
}
await dbContext.BulkCopyAsync(base.DefaultBulkCopyOptions, cipherEntities);

if (collectionUsers.Any())
{
var collectionUserEntities = Mapper.Map<List<CollectionUser>>(collectionUsers);
await dbContext.BulkCopyAsync(base.DefaultBulkCopyOptions, collectionUserEntities);
if (collections.Any())
{
var collectionEntities = Mapper.Map<List<Collection>>(collections);
await dbContext.BulkCopyAsync(base.DefaultBulkCopyOptions, collectionEntities);
}

if (collectionCiphers.Any())
{
var collectionCipherEntities = Mapper.Map<List<CollectionCipher>>(collectionCiphers);
await dbContext.BulkCopyAsync(base.DefaultBulkCopyOptions, collectionCipherEntities);
}

if (collectionUsers.Any())
{
var collectionUserEntities = Mapper.Map<List<CollectionUser>>(collectionUsers);
await dbContext.BulkCopyAsync(base.DefaultBulkCopyOptions, collectionUserEntities);
}
}

await dbContext.UserBumpAccountRevisionDateByOrganizationIdAsync(ciphers.First().OrganizationId.Value);
Expand Down
Loading