From 344ebd1ab6c0d8808c9305dcffd16be073dad535 Mon Sep 17 00:00:00 2001 From: Grant Murphy Date: Wed, 2 Nov 2016 17:03:24 -0700 Subject: [PATCH 1/2] Add go vet to travis-ci --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f4f458a..91d40c5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,6 @@ language: go - +before_script: + - go vet ./... go: - 1.5 - tip From 686927c894a617d4ba03f161bfca962845033dc9 Mon Sep 17 00:00:00 2001 From: Grant Murphy Date: Wed, 2 Nov 2016 17:12:23 -0700 Subject: [PATCH 2/2] Address go vet failure in SQL rule --- rules/sql.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/rules/sql.go b/rules/sql.go index 3756c0b..aedd868 100644 --- a/rules/sql.go +++ b/rules/sql.go @@ -30,10 +30,12 @@ type SqlStrConcat struct { SqlStatement } -// see if we can figgure out what it is +// see if we can figure out what it is func (s *SqlStrConcat) checkObject(n *ast.Ident) bool { if n.Obj != nil { - return (n.Obj.Kind != ast.Var || n.Obj.Kind != ast.Fun) + // TODO(gm): Revisit logic used here. + //return (n.Obj.Kind != ast.Var || n.Obj.Kind != ast.Fun) + return n.Obj.Kind != ast.Var && n.Obj.Kind != ast.Fun } return false }