From 94ed7762cf0287e447f3317e00164b4cca651622 Mon Sep 17 00:00:00 2001 From: Jille Timmermans Date: Thu, 22 Jun 2023 19:12:05 +0200 Subject: [PATCH] A few small staticcheck fixes --- internal/cmd/generate.go | 6 +++--- internal/sql/catalog/schema.go | 2 +- internal/sql/validate/param_ref.go | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/internal/cmd/generate.go b/internal/cmd/generate.go index efd58d6689..ebd98e073f 100644 --- a/internal/cmd/generate.go +++ b/internal/cmd/generate.go @@ -115,11 +115,11 @@ func readConfig(stderr io.Writer, dir, filename string) (string, *config.Config, if err != nil { switch err { case config.ErrMissingVersion: - fmt.Fprintf(stderr, errMessageNoVersion) + fmt.Fprint(stderr, errMessageNoVersion) case config.ErrUnknownVersion: - fmt.Fprintf(stderr, errMessageUnknownVersion) + fmt.Fprint(stderr, errMessageUnknownVersion) case config.ErrNoPackages: - fmt.Fprintf(stderr, errMessageNoPackages) + fmt.Fprint(stderr, errMessageNoPackages) } fmt.Fprintf(stderr, "error parsing %s: %s\n", base, err) return "", nil, err diff --git a/internal/sql/catalog/schema.go b/internal/sql/catalog/schema.go index 1d834ac355..f838ac7c4f 100644 --- a/internal/sql/catalog/schema.go +++ b/internal/sql/catalog/schema.go @@ -20,7 +20,7 @@ type Schema struct { func (s *Schema) getFunc(rel *ast.FuncName, tns []*ast.TypeName) (*Function, int, error) { for i := range s.Funcs { - if strings.ToLower(s.Funcs[i].Name) != strings.ToLower(rel.Name) { + if !strings.EqualFold(s.Funcs[i].Name, rel.Name) { continue } diff --git a/internal/sql/validate/param_ref.go b/internal/sql/validate/param_ref.go index 170a158527..b94a983863 100644 --- a/internal/sql/validate/param_ref.go +++ b/internal/sql/validate/param_ref.go @@ -27,7 +27,7 @@ func ParamRef(n ast.Node) (map[int]bool, bool, error) { } }), n) if dollar && nodollar { - return nil, false, errors.New("Can not mix $1 format with ? format") + return nil, false, errors.New("can not mix $1 format with ? format") } seen := map[int]bool{}