From c311b0984429ef8a0e3ab52acffe439e2622f0bd Mon Sep 17 00:00:00 2001 From: David Dworken Date: Tue, 12 Sep 2023 15:53:52 -0700 Subject: [PATCH] Improve error messages when we fail to delete pre-saved history entries --- client/cmd/saveHistoryEntry.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/cmd/saveHistoryEntry.go b/client/cmd/saveHistoryEntry.go index 4840281..a4aaf99 100644 --- a/client/cmd/saveHistoryEntry.go +++ b/client/cmd/saveHistoryEntry.go @@ -140,11 +140,11 @@ func saveHistoryEntry(ctx context.Context) { if config.BetaMode { tx, err := lib.MakeWhereQueryFromSearch(ctx, db, "cwd:"+entry.CurrentWorkingDirectory+" start_time:"+strconv.FormatInt(entry.StartTime.Unix(), 10)) if err != nil { - lib.CheckFatalError(fmt.Errorf("failed to query for pre-saved history entries: %w", err)) + lib.CheckFatalError(fmt.Errorf("failed to query for pre-saved history entry: %w", err)) } res := tx.Delete(&data.HistoryEntry{}) if res.Error != nil { - lib.CheckFatalError(fmt.Errorf("failed to delete pre-saved history entries: %w", res.Error)) + lib.CheckFatalError(fmt.Errorf("failed to delete pre-saved history entry (expected command=%#v): %w", entry.Command, res.Error)) } if res.RowsAffected > 1 { lib.CheckFatalError(fmt.Errorf("attempted to delete pre-saved entry, but something went wrong since we deleted %d rows", res.RowsAffected))