From 14a2fd62153d6221e6ce66310063bf500b56a498 Mon Sep 17 00:00:00 2001 From: Gani Georgiev Date: Mon, 4 Dec 2023 16:23:56 +0200 Subject: [PATCH] skip wrapping sql.ErrNoRows --- daos/base_retry.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/daos/base_retry.go b/daos/base_retry.go index f74b4c13..8be2409a 100644 --- a/daos/base_retry.go +++ b/daos/base_retry.go @@ -2,6 +2,8 @@ package daos import ( "context" + "database/sql" + "errors" "fmt" "strings" "time" @@ -27,11 +29,11 @@ func execLockRetry(timeout time.Duration, maxRetries int) dbx.ExecHookFunc { execErr := baseLockRetry(func(attempt int) error { return op() }, maxRetries) - if execErr != nil { - return fmt.Errorf("%w; failed query: %s", execErr, q.SQL()) + if execErr != nil && !errors.Is(execErr, sql.ErrNoRows) { + execErr = fmt.Errorf("%w; failed query: %s", execErr, q.SQL()) } - return nil + return execErr } }