review

Author: ldez

.golangci.next.reference.yml

@@ -68,7 +68,6 @@ linters:
     - goprintffuncname
     - gosec
     - gosmopolitan
-    - unqueryvet
     - govet
     - grouper
     - iface
@@ -121,6 +120,7 @@ linters:
     - tparallel
     - unconvert
     - unparam
+    - unqueryvet
     - unused
     - usestdlibvars
     - usetesting
@@ -182,7 +182,6 @@ linters:
     - goprintffuncname
     - gosec
     - gosmopolitan
-    - unqueryvet
     - govet
     - grouper
     - iface
@@ -235,6 +234,7 @@ linters:
     - tparallel
     - unconvert
     - unparam
+    - unqueryvet
     - unused
     - usestdlibvars
     - usetesting
@@ -1679,21 +1679,6 @@ linters:
         - Hiragana
         - Katakana
 
-    unqueryvet:
-      # 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
@@ -3901,6 +3886,21 @@ linters:
       # Default: false
       check-exported: true
 
+    unqueryvet:
+      # 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"
+
     unused:
       # Mark all struct fields that have been written to as used.
       # Default: true

go.mod

@@ -15,6 +15,7 @@ require (
 	github.com/Antonboom/testifylint v1.6.4
 	github.com/BurntSushi/toml v1.5.0
 	github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24
+	github.com/MirrexOne/unqueryvet v1.2.1
 	github.com/OpenPeeDeeP/depguard/v2 v2.2.1
 	github.com/alecthomas/chroma/v2 v2.20.0
 	github.com/alecthomas/go-check-sumtype v0.3.1
@@ -149,7 +150,6 @@ require (
 	codeberg.org/chavacava/garif v0.2.0 // indirect
 	dev.gaijin.team/go/golib v0.6.0 // indirect
 	github.com/Masterminds/semver/v3 v3.3.1 // indirect
-	github.com/MirrexOne/unqueryvet v1.2.1
 	github.com/alfatraining/structtag v1.0.0 // indirect
 	github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
@@ -225,5 +225,3 @@ require (
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 )
-
-replace github.com/MirrexOne/unqueryvet => ../unqueryvet

go.sum

@@ -2342,24 +2342,6 @@
             }
           }
         },
-        "unqueryvetSettings": {
-          "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,
@@ -4018,6 +4000,24 @@
             }
           }
         },
+        "unqueryvetSettings": {
+          "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"
+              }
+            }
+          }
+        },
         "unusedSettings": {
           "type": "object",
           "additionalProperties": false,
@@ -4685,9 +4685,6 @@
             "gosmopolitan": {
               "$ref": "#/definitions/settings/definitions/gosmopolitanSettings"
             },
-            "unqueryvet": {
-              "$ref": "#/definitions/settings/definitions/unqueryvetSettings"
-            },
             "govet": {
               "$ref": "#/definitions/settings/definitions/govetSettings"
             },
@@ -4817,6 +4814,9 @@
             "unparam": {
               "$ref": "#/definitions/settings/definitions/unparamSettings"
             },
+            "unqueryvet": {
+              "$ref": "#/definitions/settings/definitions/unqueryvetSettings"
+            },
             "unused": {
               "$ref": "#/definitions/settings/definitions/unusedSettings"
             },

jsonschema/golangci.next.jsonschema.json

@@ -86,9 +86,6 @@ var defaultLintersSettings = LintersSettings{
 		EscapeHatches:   []string{},
 		WatchForScripts: []string{"Han"},
 	},
-	Unqueryvet: UnqueryvetSettings{
-		CheckSQLBuilders: true,
-	},
 	Inamedparam: INamedParamSettings{
 		SkipSingleParam: false,
 	},
@@ -165,6 +162,9 @@ var defaultLintersSettings = LintersSettings{
 		SkipRegexp:    `(export|internal)_test\.go`,
 		AllowPackages: []string{"main"},
 	},
+	Unqueryvet: UnqueryvetSettings{
+		CheckSQLBuilders: true,
+	},
 	Unused: UnusedSettings{
 		FieldWritesAreUses:     true,
 		PostStatementsAreReads: false,
@@ -253,7 +253,7 @@ type LintersSettings struct {
 	Gomodguard               GoModGuardSettings               `mapstructure:"gomodguard"`
 	Gosec                    GoSecSettings                    `mapstructure:"gosec"`
 	Gosmopolitan             GosmopolitanSettings             `mapstructure:"gosmopolitan"`
-	Unqueryvet                 UnqueryvetSettings                 `mapstructure:"unqueryvet"`
+	Unqueryvet               UnqueryvetSettings               `mapstructure:"unqueryvet"`
 	Govet                    GovetSettings                    `mapstructure:"govet"`
 	Grouper                  GrouperSettings                  `mapstructure:"grouper"`
 	Iface                    IfaceSettings                    `mapstructure:"iface"`
@@ -614,11 +614,6 @@ type GosmopolitanSettings struct {
 	WatchForScripts []string `mapstructure:"watch-for-scripts"`
 }
 
-type UnqueryvetSettings struct {
-	CheckSQLBuilders bool     `mapstructure:"check-sql-builders"`
-	AllowedPatterns  []string `mapstructure:"allowed-patterns"`
-}
-
 type GovetSettings struct {
 	Go string `mapstructure:"-"`
 
@@ -1013,6 +1008,11 @@ type UnparamSettings struct {
 	CheckExported bool `mapstructure:"check-exported"`
 }
 
+type UnqueryvetSettings struct {
+	CheckSQLBuilders bool     `mapstructure:"check-sql-builders"`
+	AllowedPatterns  []string `mapstructure:"allowed-patterns"`
+}
+
 type UnusedSettings struct {
 	FieldWritesAreUses     bool `mapstructure:"field-writes-are-uses"`
 	PostStatementsAreReads bool `mapstructure:"post-statements-are-reads"`

pkg/config/linters_settings.go

@@ -21,4 +21,4 @@ func New(settings *config.UnqueryvetSettings) *goanalysis.Linter {
 	return goanalysis.
 		NewLinterFromAnalyzer(unqueryvet.NewWithConfig(&cfg)).
 		WithLoadMode(goanalysis.LoadModeSyntax)
-}
+}

pkg/golinters/unqueryvet/unqueryvet.go

@@ -8,4 +8,4 @@ import (
 
 func TestFromTestdata(t *testing.T) {
 	integration.RunTestdata(t)
-}
+}

pkg/golinters/unqueryvet/unqueryvet_integration_test.go

@@ -56,7 +56,6 @@ 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/unqueryvet"
 	"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"
@@ -110,6 +109,7 @@ import (
 	"github.com/golangci/golangci-lint/v2/pkg/golinters/tparallel"
 	"github.com/golangci/golangci-lint/v2/pkg/golinters/unconvert"
 	"github.com/golangci/golangci-lint/v2/pkg/golinters/unparam"
+	"github.com/golangci/golangci-lint/v2/pkg/golinters/unqueryvet"
 	"github.com/golangci/golangci-lint/v2/pkg/golinters/unused"
 	"github.com/golangci/golangci-lint/v2/pkg/golinters/usestdlibvars"
 	"github.com/golangci/golangci-lint/v2/pkg/golinters/usetesting"
@@ -404,10 +404,6 @@ func (LinterBuilder) Build(cfg *config.Config) ([]*linter.Config, error) {
 			WithLoadForGoAnalysis().
 			WithURL("https://github.com/xen0n/gosmopolitan"),
 
-		linter.NewConfig(unqueryvet.New(&cfg.Linters.Settings.Unqueryvet)).
-			WithSince("v2.5.0").
-			WithURL("https://github.com/MirrexOne/unqueryvet"),
-
 		linter.NewConfig(govet.New(&cfg.Linters.Settings.Govet)).
 			WithGroups(config.GroupStandard).
 			WithSince("v1.0.0").
@@ -667,6 +663,10 @@ func (LinterBuilder) Build(cfg *config.Config) ([]*linter.Config, error) {
 			WithLoadForGoAnalysis().
 			WithURL("https://github.com/mvdan/unparam"),
 
+		linter.NewConfig(unqueryvet.New(&cfg.Linters.Settings.Unqueryvet)).
+			WithSince("v2.5.0").
+			WithURL("https://github.com/MirrexOne/unqueryvet"),
+
 		linter.NewConfig(unused.New(&cfg.Linters.Settings.Unused)).
 			WithGroups(config.GroupStandard).
 			WithSince("v1.20.0").