From d4a1313643fc1f8a868730c8056f32a05ce0fb51 Mon Sep 17 00:00:00 2001 From: daheige Date: Sat, 10 Apr 2021 22:28:02 +0800 Subject: [PATCH] record not found back to the previous mode --- errors.go | 4 +--- logger/logger.go | 5 ++--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/errors.go b/errors.go index 3126b8e7..5f464d2b 100644 --- a/errors.go +++ b/errors.go @@ -2,13 +2,11 @@ package gorm import ( "errors" - - "gorm.io/gorm/logger" ) var ( // ErrRecordNotFound record not found error - ErrRecordNotFound = logger.ErrRecordNotFound + ErrRecordNotFound = errors.New("record not found") // ErrInvalidTransaction invalid transaction when you are trying to `Commit` or `Rollback` ErrInvalidTransaction = errors.New("no valid transaction") // ErrNotImplemented not implemented diff --git a/logger/logger.go b/logger/logger.go index f14748c1..44fcf36e 100644 --- a/logger/logger.go +++ b/logger/logger.go @@ -9,11 +9,10 @@ import ( "os" "time" + "gorm.io/gorm" "gorm.io/gorm/utils" ) -var ErrRecordNotFound = errors.New("record not found") - // Colors const ( Reset = "\033[0m" @@ -142,7 +141,7 @@ func (l logger) Trace(ctx context.Context, begin time.Time, fc func() (string, i if l.LogLevel > Silent { elapsed := time.Since(begin) switch { - case err != nil && l.LogLevel >= Error && (!errors.Is(err, ErrRecordNotFound) || !l.IgnoreRecordNotFoundError): + case err != nil && l.LogLevel >= Error && (!errors.Is(err, gorm.ErrRecordNotFound) || !l.IgnoreRecordNotFoundError): sql, rows := fc() if rows == -1 { l.Printf(l.traceErrStr, utils.FileWithLineNum(), err, float64(elapsed.Nanoseconds())/1e6, "-", sql)