review

Author: ldez

.golangci.next.reference.yml

@@ -66,8 +66,8 @@ linters:
     - gomodguard
     - goprintffuncname
     - gosec
-    - gounqvet
     - gosmopolitan
+    - gounqvet
     - govet
     - grouper
     - iface
@@ -178,8 +178,8 @@ linters:
     - gomodguard
     - goprintffuncname
     - gosec
-    - gounqvet
     - gosmopolitan
+    - gounqvet
     - govet
     - grouper
     - iface
@@ -1580,16 +1580,6 @@ linters:
         # Default: "0600"
         G306: "0600"
 
-    gounqvet:
-      # Enable SQL builder checking.
-      # Default: true
-      check-sql-builders: false
-      # Regex patterns for acceptable SELECT * usage.
-      # Default: ["SELECT \\* FROM information_schema\\..*", "SELECT \\* FROM pg_catalog\\..*", "SELECT COUNT\\(\\*\\)", "SELECT MAX\\(\\*\\)", "SELECT MIN\\(\\*\\)"]
-      allowed-patterns:
-        - "SELECT \\* FROM temp_.*"
-        - "SELECT \\* FROM.*-- migration"
-
     gosmopolitan:
       # Allow and ignore `time.Local` usages.
       #
@@ -1617,6 +1607,21 @@ linters:
         - Hiragana
         - Katakana
 
+    gounqvet:
+      # Enable SQL builder checking.
+      # Default: true
+      check-sql-builders: false
+      # Regex patterns for acceptable SELECT * usage.
+      # Default:
+      # - "SELECT \\* FROM information_schema\\..*"
+      # - "SELECT \\* FROM pg_catalog\\..*"
+      # - "SELECT COUNT\\(\\*\\)"
+      # - "SELECT MAX\\(\\*\\)"
+      # - "SELECT MIN\\(\\*\\)"
+      allowed-patterns:
+        - "SELECT \\* FROM temp_.*"
+        - "SELECT \\* FROM.*-- migration"
+
     govet:
       # Disable all analyzers.
       # Default: false

jsonschema/golangci.next.jsonschema.json

@@ -2260,6 +2260,24 @@
             }
           }
         },
+        "gounqvetSettings": {
+          "type": "object",
+          "additionalProperties": false,
+          "properties": {
+            "check-sql-builders": {
+              "description": "Enable SQL builder checking.",
+              "type": "boolean",
+              "default": true
+            },
+            "allowed-patterns": {
+              "description": "Regex patterns for acceptable SELECT * usage.",
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          }
+        },
         "govetSettings": {
           "type": "object",
           "additionalProperties": false,
@@ -4571,6 +4589,9 @@
             "gosmopolitan": {
               "$ref": "#/definitions/settings/definitions/gosmopolitanSettings"
             },
+            "gounqvet": {
+              "$ref": "#/definitions/settings/definitions/gounqvetSettings"
+            },
             "govet": {
               "$ref": "#/definitions/settings/definitions/govetSettings"
             },

pkg/config/linters_settings.go

@@ -86,6 +86,9 @@ var defaultLintersSettings = LintersSettings{
 		EscapeHatches:   []string{},
 		WatchForScripts: []string{"Han"},
 	},
+	Gounqvet: GounqvetSettings{
+		CheckSQLBuilders: true,
+	},
 	Inamedparam: INamedParamSettings{
 		SkipSingleParam: false,
 	},
@@ -249,8 +252,8 @@ type LintersSettings struct {
 	Gomodguard               GoModGuardSettings               `mapstructure:"gomodguard"`
 	Gosec                    GoSecSettings                    `mapstructure:"gosec"`
 	Gosmopolitan             GosmopolitanSettings             `mapstructure:"gosmopolitan"`
-	Govet                    GovetSettings                    `mapstructure:"govet"`
 	Gounqvet                 GounqvetSettings                 `mapstructure:"gounqvet"`
+	Govet                    GovetSettings                    `mapstructure:"govet"`
 	Grouper                  GrouperSettings                  `mapstructure:"grouper"`
 	Iface                    IfaceSettings                    `mapstructure:"iface"`
 	ImportAs                 ImportAsSettings                 `mapstructure:"importas"`
@@ -591,6 +594,11 @@ type GosmopolitanSettings struct {
 	WatchForScripts []string `mapstructure:"watch-for-scripts"`
 }
 
+type GounqvetSettings struct {
+	CheckSQLBuilders bool     `mapstructure:"check-sql-builders"`
+	AllowedPatterns  []string `mapstructure:"allowed-patterns"`
+}
+
 type GovetSettings struct {
 	Go string `mapstructure:"-"`
 
@@ -1079,8 +1087,3 @@ func (s *CustomLinterSettings) Validate() error {
 
 	return nil
 }
-
-type GounqvetSettings struct {
-	CheckSQLBuilders bool     `mapstructure:"check-sql-builders"`
-	AllowedPatterns  []string `mapstructure:"allowed-patterns"`
-}

pkg/golinters/gounqvet/gounqvet.go

@@ -1,29 +1,24 @@
 package gounqvet
 
 import (
-	"golang.org/x/tools/go/analysis"
-
 	"github.com/MirrexOne/gounqvet"
 	pkgconfig "github.com/MirrexOne/gounqvet/pkg/config"
+
 	"github.com/golangci/golangci-lint/v2/pkg/config"
 	"github.com/golangci/golangci-lint/v2/pkg/goanalysis"
 )
 
 func New(settings *config.GounqvetSettings) *goanalysis.Linter {
 	var cfg *pkgconfig.GounqvetSettings
+
 	if settings != nil {
 		cfg = &pkgconfig.GounqvetSettings{
 			CheckSQLBuilders: settings.CheckSQLBuilders,
 			AllowedPatterns:  settings.AllowedPatterns,
 		}
 	}
 
-	analyzer := gounqvet.NewWithConfig(cfg)
-	
-	return goanalysis.NewLinter(
-		"gounqvet",
-		"Detects SELECT * usage in SQL queries and SQL builders, encouraging explicit column selection",
-		[]*analysis.Analyzer{analyzer},
-		nil,
-	).WithLoadMode(goanalysis.LoadModeSyntax)
+	return goanalysis.
+		NewLinterFromAnalyzer(gounqvet.NewWithConfig(cfg)).
+		WithLoadMode(goanalysis.LoadModeSyntax)
 }

pkg/golinters/gounqvet/gounqvet_integration_test.go

@@ -0,0 +1,11 @@
+package gounqvet
+
+import (
+	"testing"
+
+	"github.com/golangci/golangci-lint/v2/test/testshared/integration"
+)
+
+func TestFromTestdata(t *testing.T) {
+	integration.RunTestdata(t)
+}

pkg/golinters/gounqvet/testdata/gounqvet.go

@@ -7,7 +7,8 @@ import (
 	"strconv"
 )
 
-func badQueries() {
+// badQueries
+func _() {
 	query := "SELECT * FROM users" // want "avoid SELECT \\* - explicitly specify needed columns for better performance, maintainability and stability"
 
 	var db *sql.DB
@@ -35,12 +36,14 @@ type SQLBuilder interface {
 	Query() string
 }
 
-func badSQLBuilder(builder SQLBuilder) {
+// badSQLBuilder
+func _(builder SQLBuilder) {
 	query := builder.Select("*").From("products") // want "avoid SELECT \\* in SQL builder - explicitly specify columns to prevent unnecessary data transfer and schema change issues"
 	_ = query
 }
 
-func goodSQLBuilder(builder SQLBuilder) {
+// goodSQLBuilder
+func _(builder SQLBuilder) {
 	// Good usage - should not trigger
 	query := builder.Select("id", "name", "price").From("products")
 	_ = query

pkg/golinters/gounqvet/testdata/gounqvet_custom.go

@@ -0,0 +1,51 @@
+//golangcitest:args -Egounqvet
+//golangcitest:config_path testdata/gounqvet_custom.yml
+package testdata
+
+import (
+	"database/sql"
+	"fmt"
+	"strconv"
+)
+
+// badQueries
+func _() {
+	query := "SELECT * FROM users" // want "avoid SELECT \\* - explicitly specify needed columns for better performance, maintainability and stability"
+
+	var db *sql.DB
+	rows, _ := db.Query("SELECT * FROM orders WHERE status = ?", "active") // want "avoid SELECT \\* - explicitly specify needed columns for better performance, maintainability and stability"
+	_ = rows
+
+	// This should not trigger because it's a COUNT function
+	count := "SELECT COUNT(*) FROM users"
+	_ = count
+
+	// Good queries (should not trigger)
+	goodQuery := "SELECT id, name, email FROM users"
+	_ = goodQuery
+
+	fmt.Println(query)
+
+	// Use strconv to satisfy std lib import requirement
+	_ = strconv.Itoa(42)
+}
+
+type SQLBuilder interface {
+	Select(columns ...string) SQLBuilder
+	From(table string) SQLBuilder
+	Where(condition string) SQLBuilder
+	Query() string
+}
+
+// badSQLBuilder
+func _(builder SQLBuilder) {
+	query := builder.Select("*").From("products")
+	_ = query
+}
+
+// goodSQLBuilder
+func _(builder SQLBuilder) {
+	// Good usage - should not trigger
+	query := builder.Select("id", "name", "price").From("products")
+	_ = query
+}

pkg/golinters/gounqvet/testdata/gounqvet_custom.yml

@@ -0,0 +1,6 @@
+version: "2"
+
+linters:
+  settings:
+    gounqvet:
+      check-sql-builders: false

pkg/lint/lintersdb/builder_linter.go

@@ -55,8 +55,8 @@ import (
 	"github.com/golangci/golangci-lint/v2/pkg/golinters/goprintffuncname"
 	"github.com/golangci/golangci-lint/v2/pkg/golinters/gosec"
 	"github.com/golangci/golangci-lint/v2/pkg/golinters/gosmopolitan"
-	"github.com/golangci/golangci-lint/v2/pkg/golinters/govet"
 	"github.com/golangci/golangci-lint/v2/pkg/golinters/gounqvet"
+	"github.com/golangci/golangci-lint/v2/pkg/golinters/govet"
 	"github.com/golangci/golangci-lint/v2/pkg/golinters/grouper"
 	"github.com/golangci/golangci-lint/v2/pkg/golinters/iface"
 	"github.com/golangci/golangci-lint/v2/pkg/golinters/importas"
@@ -393,15 +393,15 @@ func (LinterBuilder) Build(cfg *config.Config) ([]*linter.Config, error) {
 			WithLoadForGoAnalysis().
 			WithURL("https://github.com/securego/gosec"),
 
-		linter.NewConfig(gounqvet.New(&cfg.Linters.Settings.Gounqvet)).
-			WithSince("v2.5.0").
-			WithURL("https://github.com/MirrexOne/gounqvet"),
-
 		linter.NewConfig(gosmopolitan.New(&cfg.Linters.Settings.Gosmopolitan)).
 			WithSince("v1.53.0").
 			WithLoadForGoAnalysis().
 			WithURL("https://github.com/xen0n/gosmopolitan"),
 
+		linter.NewConfig(gounqvet.New(&cfg.Linters.Settings.Gounqvet)).
+			WithSince("v2.5.0").
+			WithURL("https://github.com/MirrexOne/gounqvet"),
+
 		linter.NewConfig(govet.New(&cfg.Linters.Settings.Govet)).
 			WithGroups(config.GroupStandard).
 			WithSince("v1.0.0").