extern/hishtory
1
0
Fork 0
mirror of https://github.com/ddworken/hishtory.git synced 2025-02-02 11:39:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add check so that if there are zero leftover entries, we don't try to import them into the DB since this leads to install errors

Browse Source
This commit is contained in:
David Dworken 2023-10-08 20:25:53 -07:00
parent 7ffe5fc1e2
commit 717cf2c4b0
No known key found for this signature in database
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
client/lib/lib.go
View File

@ -327,7 +327,10 @@ func ImportHistory(ctx context.Context, shouldReadStdin, force bool) (int, error
batch = append(batch, entry) batch = append(batch, entry)
if len(batch) > batchSize { if len(batch) > batchSize {
err = RetryingDbFunction(func() error { err = RetryingDbFunction(func() error {
return db.Create(batch).Error if err := db.Create(batch).Error; err != nil {
return fmt.Errorf("failed to import batch of history entries: %w", err)
}
return nil
}) })
if err != nil { if err != nil {
iteratorError = fmt.Errorf("failed to insert imported history entry: %w", err) iteratorError = fmt.Errorf("failed to insert imported history entry: %w", err)
@ -342,9 +345,14 @@ func ImportHistory(ctx context.Context, shouldReadStdin, force bool) (int, error
return 0, iteratorError return 0, iteratorError
} }
// Also create any entries remaining in an unfinished batch // Also create any entries remaining in an unfinished batch
err = RetryingDbFunction(func() error { if len(batch) > 0 {
return db.Create(batch).Error err = RetryingDbFunction(func() error {
}) if err := db.Create(batch).Error; err != nil {
return fmt.Errorf("failed to import final batch of history entries: %w", err)
}
return nil
})
}
if err != nil { if err != nil {
return 0, err return 0, err
} }