From 673053f56a037fdd01031bee397188ff17830376 Mon Sep 17 00:00:00 2001 From: Jinzhu Date: Fri, 9 Apr 2021 09:35:41 +0800 Subject: [PATCH] Fix context cancel error, close #4259, close #4260 --- scan.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scan.go b/scan.go index acd637a4..e82e3f07 100644 --- a/scan.go +++ b/scan.go @@ -241,7 +241,11 @@ func Scan(rows *sql.Rows, db *DB, initialized bool) { } } - if db.RowsAffected == 0 && db.Statement.RaiseErrorOnNotFound { + if err := rows.Err(); err != nil && err != db.Error { + db.AddError(err) + } + + if db.RowsAffected == 0 && db.Statement.RaiseErrorOnNotFound && db.Error == nil { db.AddError(ErrRecordNotFound) } }