fix: remove useless dependencies

.gitignore

@@ -1,3 +1,4 @@
 sqlclosecheck
 bin/
 sqlx_examples_results.txt
+pgx_examples_results.txt

Makefile

@@ -13,15 +13,6 @@ install:
 
 test: build
 	go test ./...
-	# Due to an issue with importing in a anaylsistest's test data some hoop jumping is required
-	# I call twice to avoid collecting package downloads in output
-	-go vet -vettool=$(BIN)/sqlclosecheck ./testdata/sqlx_examples
-	-go vet -vettool=$(BIN)/sqlclosecheck ./testdata/sqlx_examples 2> sqlx_examples_results.txt
-	diff -a sqlx_examples_results.txt ./testdata/sqlx_examples/expected_results.txt
-
-	-go vet -vettool=$(BIN)/sqlclosecheck ./testdata/pgx_examples
-	-go vet -vettool=$(BIN)/sqlclosecheck ./testdata/pgx_examples 2> pgx_examples_results.txt
-	diff -a pgx_examples_results.txt ./testdata/pgx_examples/expected_results.txt
 
 lint:
 	curl -sSfL https://golangci-lint.run/install.sh | sh -s -- v2.11.3

go.mod

@@ -2,19 +2,9 @@ module github.com/ryanrolds/sqlclosecheck
 
 go 1.25.0
 
-require (
-	github.com/go-sql-driver/mysql v1.7.1
-	github.com/jackc/pgx/v5 v5.5.4
-	github.com/jmoiron/sqlx v1.3.5
-	golang.org/x/tools v0.40.0
-)
+require golang.org/x/tools v0.40.0
 
 require (
-	github.com/jackc/pgpassfile v1.0.0 // indirect
-	github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
-	github.com/jackc/puddle/v2 v2.2.1 // indirect
-	golang.org/x/crypto v0.46.0 // indirect
 	golang.org/x/mod v0.31.0 // indirect
 	golang.org/x/sync v0.19.0 // indirect
-	golang.org/x/text v0.32.0 // indirect
 )

go.sum

@@ -1,43 +1,8 @@
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
-github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
-github.com/go-sql-driver/mysql v1.7.1 h1:lUIinVbN1DY0xBg0eMOzmmtGoHwWBbvnWubQUrtU8EI=
-github.com/go-sql-driver/mysql v1.7.1/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
-github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
-github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a h1:bbPeKD0xmW/Y25WS6cokEszi5g+S0QxI/d45PkRi7Nk=
-github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM=
-github.com/jackc/pgx/v5 v5.5.4 h1:Xp2aQS8uXButQdnCMWNmvx6UysWQQC+u1EoizjguY+8=
-github.com/jackc/pgx/v5 v5.5.4/go.mod h1:ez9gk+OAat140fv9ErkZDYFWmXLfV+++K0uAOiwgm1A=
-github.com/jackc/puddle/v2 v2.2.1 h1:RhxXJtFG022u4ibrCSMSiu5aOq1i77R3OHKNJj77OAk=
-github.com/jackc/puddle/v2 v2.2.1/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4=
-github.com/jmoiron/sqlx v1.3.5 h1:vFFPA71p1o5gAeqtEAwLU4dnX2napprKtHr7PYIcN3g=
-github.com/jmoiron/sqlx v1.3.5/go.mod h1:nRVWtLre0KfCLJvgxzCsLVMogSvQ1zNJtpYr2Ccp0mQ=
-github.com/lib/pq v1.2.0 h1:LXpIM/LZ5xGFhOpXAQUIMM1HdyqzVYM13zNdjCEEcA0=
-github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
-github.com/mattn/go-sqlite3 v1.14.6 h1:dNPt6NO46WmLVt2DLNpwczCmdV5boIZ6g/tlDrlRUbg=
-github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
-github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-golang.org/x/crypto v0.46.0 h1:cKRW/pmt1pKAfetfu+RCEvjvZkA9RimPbh7bhFjGVBU=
-golang.org/x/crypto v0.46.0/go.mod h1:Evb/oLKmMraqjZ2iQTwDwvCtJkczlDuTmdJXoZVzqU0=
 golang.org/x/mod v0.31.0 h1:HaW9xtz0+kOcWKwli0ZXy79Ix+UW/vOfmWI5QVd2tgI=
 golang.org/x/mod v0.31.0/go.mod h1:43JraMp9cGx1Rx3AqioxrbrhNsLl2l/iNAvuBkrezpg=
 golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4=
 golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
-golang.org/x/text v0.32.0 h1:ZD01bjUt1FQ9WJ0ClOL5vxgxOI/sVCNgX1YtKwcY0mU=
-golang.org/x/text v0.32.0/go.mod h1:o/rUWzghvpD5TXrTIBuJU77MTaN0ljMWE47kxGJQ7jY=
 golang.org/x/tools v0.40.0 h1:yLkxfA+Qnul4cs9QA3KnlFu0lVmd8JJfoq+E41uSutA=
 golang.org/x/tools v0.40.0/go.mod h1:Ik/tzLRlbscWpqqMRjyWYDisX8bG13FrdXp3o4Sr9lc=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

pkg/analyzer/analyzer_test.go

@@ -17,6 +17,7 @@ func TestAnalyzer(t *testing.T) {
 		"github.com/ryanrolds/sqlclosecheck/pkg/analyzer/testdata/rows",
 		"github.com/ryanrolds/sqlclosecheck/pkg/analyzer/testdata/stmt",
 		"github.com/ryanrolds/sqlclosecheck/pkg/analyzer/testdata/pgx",
+		"github.com/ryanrolds/sqlclosecheck/pkg/analyzer/testdata/sqlx",
 	}
 
 	for _, pkg := range packages {

pkg/analyzer/testdata/go.mod

@@ -1,10 +1,15 @@
 module github.com/ryanrolds/sqlclosecheck/pkg/analyzer/testdata
 
-go 1.21
+go 1.21.0
 
-require github.com/jackc/pgx/v5 v5.4.3
+require (
+	github.com/go-sql-driver/mysql v1.9.3
+	github.com/jackc/pgx/v5 v5.4.3
+	github.com/jmoiron/sqlx v1.4.0
+)
 
 require (
+	filippo.io/edwards25519 v1.1.0 // indirect
 	github.com/jackc/pgpassfile v1.0.0 // indirect
 	github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
 	github.com/jackc/puddle/v2 v2.2.1 // indirect

pkg/analyzer/testdata/go.sum

@@ -1,6 +1,11 @@
+filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
+filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg=
+github.com/go-sql-driver/mysql v1.9.3 h1:U/N249h2WzJ3Ukj8SowVFjdtZKfu9vlLZxjPXV1aweo=
+github.com/go-sql-driver/mysql v1.9.3/go.mod h1:qn46aNg1333BRMNU69Lq93t8du/dwxI64Gl8i5p1WMU=
 github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
 github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
 github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a h1:bbPeKD0xmW/Y25WS6cokEszi5g+S0QxI/d45PkRi7Nk=
@@ -9,6 +14,12 @@ github.com/jackc/pgx/v5 v5.4.3 h1:cxFyXhxlvAifxnkKKdlxv8XqUf59tDlYjnV5YYfsJJY=
 github.com/jackc/pgx/v5 v5.4.3/go.mod h1:Ig06C2Vu0t5qXC60W8sqIthScaEnFvojjj9dSljmHRA=
 github.com/jackc/puddle/v2 v2.2.1 h1:RhxXJtFG022u4ibrCSMSiu5aOq1i77R3OHKNJj77OAk=
 github.com/jackc/puddle/v2 v2.2.1/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4=
+github.com/jmoiron/sqlx v1.4.0 h1:1PLqN7S1UYp5t4SrVVnt4nUVNemrDAtxlulVe+Qgm3o=
+github.com/jmoiron/sqlx v1.4.0/go.mod h1:ZrZ7UsYB/weZdl2Bxg6jCRO9c3YHl8r3ahlKmRT4JLY=
+github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
+github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
+github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU=
+github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=

testdata/sqlx_examples/close_in_other_func.go → pkg/analyzer/testdata/sqlx/close_in_other_func.go

@@ -1,4 +1,4 @@
-package sqlx_examples
+package sqlx
 
 import (
 	"fmt"

testdata/sqlx_examples/common.go → pkg/analyzer/testdata/sqlx/common.go

@@ -1,4 +1,4 @@
-package sqlx_examples
+package sqlx
 
 import (
 	_ "github.com/go-sql-driver/mysql"

testdata/sqlx_examples/correct_defer.go → pkg/analyzer/testdata/sqlx/correct_defer.go

@@ -1,4 +1,4 @@
-package sqlx_examples
+package sqlx
 
 import (
 	"log"

testdata/sqlx_examples/correct_generics.go → pkg/analyzer/testdata/sqlx/correct_generics.go

@@ -1,4 +1,4 @@
-package sqlx_examples
+package sqlx
 
 import (
 	"log"

pkg/analyzer/testdata/sqlx/failure_generics.go

@@ -0,0 +1,17 @@
+package sqlx
+
+import "database/sql"
+
+func SqlCloseCheck(db *sql.DB, a int) {
+	rows, _ := db.Query("select id from tb") // want "Rows/Stmt/NamedStmt was not closed"
+	for rows.Next() {
+
+	}
+}
+
+func SqlCloseCheckG[T ~int64](db *sql.DB, a T) {
+	rows, _ := db.Query("select id from tb") // want "Rows/Stmt/NamedStmt was not closed"
+	for rows.Next() {
+
+	}
+}

testdata/sqlx_examples/missing_close.go → pkg/analyzer/testdata/sqlx/missing_close.go

@@ -1,4 +1,4 @@
-package sqlx_examples
+package sqlx
 
 import (
 	"log"
@@ -7,7 +7,7 @@ import (
 
 func missingClose() {
 	age := 27
-	rows, err := db.Queryx("SELECT name FROM users WHERE age=?", age)
+	rows, err := db.Queryx("SELECT name FROM users WHERE age=?", age) // want "Rows/Stmt/NamedStmt was not closed"
 	if err != nil {
 		log.Fatal(err)
 	}

testdata/sqlx_examples/missing_close_in_other_func.go → pkg/analyzer/testdata/sqlx/missing_close_in_other_func.go

@@ -1,4 +1,4 @@
-package sqlx_examples
+package sqlx
 
 import (
 	"fmt"
@@ -14,7 +14,7 @@ func ForgetCloseSqlxStmt(stmt *sqlx.Stmt) {
 }
 
 func (s Server) DeferForgetCloseInOtherFunc() {
-	stmt, err := db.Preparex("SELECT 1")
+	stmt, err := db.Preparex("SELECT 1") // want "Rows/Stmt/NamedStmt was not closed"
 	if err != nil {
 		log.Fatal(err)
 	}

testdata/sqlx_examples/missing_close_named_stmt.go → pkg/analyzer/testdata/sqlx/missing_close_named_stmt.go

@@ -1,11 +1,11 @@
-package sqlx_examples
+package sqlx
 
 import (
 	"log"
 )
 
 func missingCloseNamedStmt() {
-	stmt, err := db.PrepareNamed("SELECT * FROM users WHERE id = :id")
+	stmt, err := db.PrepareNamed("SELECT * FROM users WHERE id = :id") // want "Rows/Stmt/NamedStmt was not closed"
 	if err != nil {
 		log.Fatal(err)
 	}

testdata/sqlx_examples/non_defer_close.go → pkg/analyzer/testdata/sqlx/non_defer_close.go

@@ -1,4 +1,4 @@
-package sqlx_examples
+package sqlx
 
 import (
 	"log"
@@ -27,5 +27,5 @@ func nonDeferClose() {
 	}
 	log.Printf("%s are %d years old", strings.Join(names, ", "), age)
 
-	rows.Close()
+	rows.Close() // want "Close should use defer"
 }

testdata/sqlx_examples/return_rows.go → pkg/analyzer/testdata/sqlx/return_rows.go

@@ -1,4 +1,4 @@
-package sqlx_examples
+package sqlx
 
 import (
 	"github.com/jmoiron/sqlx"