From 4f574cddfd1f742f3fc9543c3ffa0a5a868dfadc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Olivier=20Mengu=C3=A9?= Date: Thu, 12 Jul 2018 11:47:20 +0200 Subject: [PATCH] tests/NullInt: fix Scan from string/[]byte Do not change the value if Atoi fails --- stubs_test.go | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/stubs_test.go b/stubs_test.go index 1515adb..724a2c7 100644 --- a/stubs_test.go +++ b/stubs_test.go @@ -50,13 +50,19 @@ func (ni *NullInt) Scan(value interface{}) (err error) { ni.Integer, ni.Valid = int(v), true return case []byte: - ni.Integer, err = strconv.Atoi(string(v)) - ni.Valid = (err == nil) - return + n, err := strconv.Atoi(string(v)) + if err != nil { + return err + } + ni.Integer, ni.Valid = n, true + return nil case string: - ni.Integer, err = strconv.Atoi(v) - ni.Valid = (err == nil) - return + n, err := strconv.Atoi(v) + if err != nil { + return err + } + ni.Integer, ni.Valid = n, true + return nil } ni.Valid = false