From a1e459f09dff5cf84961d44b1c33d3725ccfb79f Mon Sep 17 00:00:00 2001 From: David Vilaverde Date: Sun, 2 Jun 2024 21:24:58 -0400 Subject: [PATCH] fixing linting issues --- client/conn.go | 4 ++-- driver/driver_options_test.go | 11 +++++++---- mysql/error.go | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/client/conn.go b/client/conn.go index 9d8392053..568ca16ca 100644 --- a/client/conn.go +++ b/client/conn.go @@ -121,8 +121,8 @@ func ConnectWithDialer(ctx context.Context, network, addr, user, password, dbNam c.charset = DEFAULT_CHARSET // Apply configuration functions. - for i := range options { - if err := options[i](c); err != nil { + for _, option := range options { + if err := option(c); err != nil { return nil, err } } diff --git a/driver/driver_options_test.go b/driver/driver_options_test.go index b12af20ff..23199ddfa 100644 --- a/driver/driver_options_test.go +++ b/driver/driver_options_test.go @@ -31,16 +31,20 @@ type mockHandler struct { func TestDriverOptions_SetCollation(t *testing.T) { c := &client.Conn{} - CollationOption(c, "latin2_bin") + err := CollationOption(c, "latin2_bin") + require.NoError(t, err) require.Equal(t, "latin2_bin", c.GetCollation()) } func TestDriverOptions_SetCompression(t *testing.T) { + var err error c := &client.Conn{} - CompressOption(c, "true") + err = CompressOption(c, "true") + require.NoError(t, err) require.True(t, c.HasCapability(mysql.CLIENT_COMPRESS)) - CompressOption(c, "false") + err = CompressOption(c, "false") + require.NoError(t, err) require.False(t, c.HasCapability(mysql.CLIENT_COMPRESS)) require.Error(t, CompressOption(c, "foo")) @@ -200,7 +204,6 @@ func (h *mockHandler) HandleStmtPrepare(query string) (params int, columns int, } func (h *mockHandler) HandleStmtExecute(context interface{}, query string, args []interface{}) (*mysql.Result, error) { - if strings.HasPrefix(strings.ToLower(query), "select") { return h.HandleQuery(query) } diff --git a/mysql/error.go b/mysql/error.go index abda6dea0..e9915779b 100644 --- a/mysql/error.go +++ b/mysql/error.go @@ -61,6 +61,6 @@ func NewError(errCode uint16, message string) *MyError { func ErrorCode(errMsg string) (code int) { var tmpStr string // golang scanf doesn't support %*,so I used a temporary variable - fmt.Sscanf(errMsg, "%s%d", &tmpStr, &code) + _, _ = fmt.Sscanf(errMsg, "%s%d", &tmpStr, &code) return }