Apply go fix ./... for Go 1.26 modernization

internal/cmd/cmd.go

@@ -100,7 +100,7 @@ var initCmd = &cobra.Command{
 		if err != nil {
 			return err
 		}
-		var yamlConfig interface{}
+		var yamlConfig any
 		if useV1 {
 			yamlConfig = config.V1GenerateSettings{Version: "1"}
 		} else {

internal/cmd/createdb.go

@@ -47,7 +47,6 @@ func CreateDB(ctx context.Context, dir, filename, querySetName string, o *Option
 	var queryset *config.SQL
 	var count int
 	for _, sql := range conf.SQL {
-		sql := sql
 		if querySetName != "" && sql.Name != querySetName {
 			continue
 		}

internal/codegen/golang/field.go

@@ -97,23 +97,23 @@ func toPascalCase(s string) string {
 }
 
 func toCamelInitCase(name string, initUpper bool) string {
-	out := ""
+	var out strings.Builder
 	for i, p := range strings.Split(name, "_") {
 		if !initUpper && i == 0 {
-			out += p
+			out.WriteString(p)
 			continue
 		}
 		if p == "id" {
-			out += "ID"
+			out.WriteString("ID")
 		} else {
-			out += strings.Title(p)
+			out.WriteString(strings.Title(p))
 		}
 	}
-	return out
+	return out.String()
 }
 
 func toJsonCamelCase(name string, idUppercase bool) string {
-	out := ""
+	var out strings.Builder
 	idStr := "Id"
 
 	if idUppercase {
@@ -122,16 +122,16 @@ func toJsonCamelCase(name string, idUppercase bool) string {
 
 	for i, p := range strings.Split(name, "_") {
 		if i == 0 {
-			out += p
+			out.WriteString(p)
 			continue
 		}
 		if p == "id" {
-			out += idStr
+			out.WriteString(idStr)
 		} else {
-			out += strings.Title(p)
+			out.WriteString(strings.Title(p))
 		}
 	}
-	return out
+	return out.String()
 }
 
 func toLowerCase(str string) string {

internal/codegen/golang/gen.go

@@ -7,6 +7,7 @@ import (
 	"errors"
 	"fmt"
 	"go/format"
+	"slices"
 	"strings"
 	"text/template"
 
@@ -344,10 +345,8 @@ func usesCopyFrom(queries []Query) bool {
 
 func usesBatch(queries []Query) bool {
 	for _, q := range queries {
-		for _, cmd := range []string{metadata.CmdBatchExec, metadata.CmdBatchMany, metadata.CmdBatchOne} {
-			if q.Cmd == cmd {
-				return true
-			}
+		if slices.Contains([]string{metadata.CmdBatchExec, metadata.CmdBatchMany, metadata.CmdBatchOne}, q.Cmd) {
+			return true
 		}
 	}
 	return false

internal/codegen/golang/go_type.go

@@ -1,6 +1,7 @@
 package golang
 
 import (
+	"maps"
 	"strings"
 
 	"github.com/sqlc-dev/sqlc/internal/codegen/golang/opts"
@@ -15,9 +16,7 @@ func addExtraGoStructTags(tags map[string]string, req *plugin.GenerateRequest, o
 			continue
 		}
 		if override.MatchesColumn(col) {
-			for k, v := range oride.GoType.StructTags {
-				tags[k] = v
-			}
+			maps.Copy(tags, oride.GoType.StructTags)
 			continue
 		}
 		if !override.Matches(col.Table, req.Catalog.DefaultSchema) {
@@ -33,9 +32,7 @@ func addExtraGoStructTags(tags map[string]string, req *plugin.GenerateRequest, o
 			continue
 		}
 		// Add the extra tags.
-		for k, v := range oride.GoType.StructTags {
-			tags[k] = v
-		}
+		maps.Copy(tags, oride.GoType.StructTags)
 	}
 }
 

internal/codegen/golang/opts/go_type.go

@@ -51,7 +51,7 @@ func (o *GoType) UnmarshalJSON(data []byte) error {
 	return nil
 }
 
-func (o *GoType) UnmarshalYAML(unmarshal func(interface{}) error) error {
+func (o *GoType) UnmarshalYAML(unmarshal func(any) error) error {
 	var spec string
 	if err := unmarshal(&spec); err == nil {
 		*o = GoType{Spec: spec}

internal/codegen/golang/result.go

@@ -168,17 +168,17 @@ func paramName(p *plugin.Parameter) string {
 }
 
 func argName(name string) string {
-	out := ""
+	var out strings.Builder
 	for i, p := range strings.Split(name, "_") {
 		if i == 0 {
-			out += strings.ToLower(p)
+			out.WriteString(strings.ToLower(p))
 		} else if p == "id" {
-			out += "ID"
+			out.WriteString("ID")
 		} else {
-			out += strings.Title(p)
+			out.WriteString(strings.Title(p))
 		}
 	}
-	return out
+	return out.String()
 }
 
 func buildQueries(req *plugin.GenerateRequest, options *opts.Options, structs []Struct) ([]Query, error) {

internal/codegen/golang/struct.go

@@ -31,7 +31,7 @@ func StructName(name string, options *opts.Options) string {
 		return rune('_')
 	}, name)
 
-	for _, p := range strings.Split(name, "_") {
+	for p := range strings.SplitSeq(name, "_") {
 		if _, found := options.InitialismsMap[p]; found {
 			out += strings.ToUpper(p)
 		} else {

internal/compiler/output_columns.go

@@ -517,7 +517,6 @@ func (c *Compiler) sourceTables(qc *QueryCatalog, node ast.Node) ([]*Table, erro
 
 	var tables []*Table
 	for _, item := range list.Items {
-		item := item
 		switch n := item.(type) {
 
 		case *ast.RangeFunction:

internal/config/config.go

@@ -36,7 +36,7 @@ func (p *Paths) UnmarshalJSON(data []byte) error {
 	return nil
 }
 
-func (p *Paths) UnmarshalYAML(unmarshal func(interface{}) error) error {
+func (p *Paths) UnmarshalYAML(unmarshal func(any) error) error {
 	out := []string{}
 	if sliceErr := unmarshal(&out); sliceErr != nil {
 		var ele string
@@ -61,7 +61,7 @@ type Config struct {
 	Cloud     Cloud                `json:"cloud" yaml:"cloud"`
 	Servers   []Server             `json:"servers" yaml:"servers"`
 	SQL       []SQL                `json:"sql" yaml:"sql"`
-	Overrides Overrides            `json:"overrides,omitempty" yaml:"overrides"`
+	Overrides Overrides            `json:"overrides" yaml:"overrides"`
 	Plugins   []Plugin             `json:"plugins" yaml:"plugins"`
 	Rules     []Rule               `json:"rules" yaml:"rules"`
 	Options   map[string]yaml.Node `json:"options" yaml:"options"`
@@ -125,8 +125,8 @@ type SQL struct {
 // AnalyzerDatabase represents the database analyzer setting.
 // It can be a boolean (true/false) or the string "only" for database-only mode.
 type AnalyzerDatabase struct {
-	value   *bool  // nil means not set, true/false for boolean values
-	isOnly  bool   // true when set to "only"
+	value  *bool // nil means not set, true/false for boolean values
+	isOnly bool  // true when set to "only"
 }
 
 // IsEnabled returns true if the database analyzer should be used.
@@ -166,7 +166,7 @@ func (a *AnalyzerDatabase) UnmarshalJSON(data []byte) error {
 	return errors.New("analyzer.database must be true, false, or \"only\"")
 }
 
-func (a *AnalyzerDatabase) UnmarshalYAML(unmarshal func(interface{}) error) error {
+func (a *AnalyzerDatabase) UnmarshalYAML(unmarshal func(any) error) error {
 	// Try to unmarshal as boolean first
 	var b bool
 	if err := unmarshal(&b); err == nil {

internal/config/convert/convert.go

@@ -8,11 +8,11 @@ import (
 	"gopkg.in/yaml.v3"
 )
 
-func gen(n *yaml.Node) (interface{}, error) {
+func gen(n *yaml.Node) (any, error) {
 	switch n.Kind {
 
 	case yaml.MappingNode:
-		nn := map[string]interface{}{}
+		nn := map[string]any{}
 		for i, _ := range n.Content {
 			if i%2 == 0 {
 				k := n.Content[i]
@@ -26,7 +26,7 @@ func gen(n *yaml.Node) (interface{}, error) {
 		return nn, nil
 
 	case yaml.SequenceNode:
-		nn := []interface{}{}
+		nn := []any{}
 		for i, _ := range n.Content {
 			v, err := gen(n.Content[i])
 			if err != nil {

internal/dbmanager/client.go

@@ -90,7 +90,7 @@ func (m *ManagedClient) CreateDatabase(ctx context.Context, req *CreateDatabaseR
 	uri.Path = "/" + name
 
 	key := uri.String()
-	_, err, _ = flight.Do(key, func() (interface{}, error) {
+	_, err, _ = flight.Do(key, func() (any, error) {
 		// TODO: Use a parameterized query
 		row := pool.QueryRow(ctx,
 			fmt.Sprintf(`SELECT datname FROM pg_database WHERE datname = '%s'`, name))

internal/debug/dump.go

@@ -20,7 +20,7 @@ func init() {
 	}
 }
 
-func Dump(n ...interface{}) {
+func Dump(n ...any) {
 	if Active {
 		spew.Dump(n)
 	}

internal/endtoend/ddl_test.go

@@ -12,7 +12,6 @@ import (
 
 func TestValidSchema(t *testing.T) {
 	for _, replay := range FindTests(t, "testdata", "base") {
-		replay := replay // https://golang.org/doc/faq#closures_and_goroutines
 
 		if replay.Exec != nil {
 			if replay.Exec.Meta.InvalidSchema {
@@ -32,7 +31,6 @@ func TestValidSchema(t *testing.T) {
 		}
 
 		for j, pkg := range conf.SQL {
-			j, pkg := j, pkg
 			switch pkg.Engine {
 			case config.EnginePostgreSQL:
 				// pass

internal/endtoend/endtoend_test.go

@@ -221,8 +221,6 @@ func TestReplay(t *testing.T) {
 	}
 
 	for name, testctx := range contexts {
-		name := name
-		testctx := testctx
 
 		if !testctx.Enabled() {
 			continue
@@ -354,7 +352,6 @@ func cmpDirectory(t *testing.T, dir string, actual map[string]string) {
 	if !cmp.Equal(expected, actual, opts...) {
 		t.Errorf("%s contents differ", dir)
 		for name, contents := range expected {
-			name := name
 			if actual[name] == "" {
 				t.Errorf("%s is empty", name)
 				return

internal/endtoend/fmt_test.go

@@ -31,7 +31,6 @@ type sqlFormatter interface {
 func TestFormat(t *testing.T) {
 	t.Parallel()
 	for _, tc := range FindTests(t, "testdata", "base") {
-		tc := tc
 		t.Run(tc.Name, func(t *testing.T) {
 			// Parse the config file to determine the engine
 			configPath := filepath.Join(tc.Path, tc.ConfigName)
@@ -145,7 +144,6 @@ func TestFormat(t *testing.T) {
 				}
 
 				for i, stmt := range stmts {
-					stmt := stmt
 					t.Run(fmt.Sprintf("%d", i), func(t *testing.T) {
 						// Extract the original query text using statement location and length
 						start := stmt.Raw.StmtLocation

internal/engine/postgresql/catalog.go

@@ -4,8 +4,10 @@ import "github.com/sqlc-dev/sqlc/internal/sql/catalog"
 
 // toPointer converts an int to a pointer without a temporary
 // variable at the call-site, and is used by the generated schemas
+//
+//go:fix inline
 func toPointer(x int) *int {
-	return &x
+	return new(x)
 }
 
 func NewCatalog() *catalog.Catalog {

internal/engine/sqlite/analyzer/analyze.go

@@ -87,7 +87,7 @@ func (a *Analyzer) Analyze(ctx context.Context, n ast.Node, query string, migrat
 
 	// Get column information
 	colCount := stmt.ColumnCount()
-	for i := 0; i < colCount; i++ {
+	for i := range colCount {
 		name := stmt.ColumnName(i)
 		declType := stmt.ColumnDeclType(i)
 		tableName := stmt.ColumnTableName(i)
@@ -249,7 +249,7 @@ func (a *Analyzer) GetColumnNames(ctx context.Context, query string) ([]string,
 
 	colCount := stmt.ColumnCount()
 	columns := make([]string, colCount)
-	for i := 0; i < colCount; i++ {
+	for i := range colCount {
 		columns[i] = stmt.ColumnName(i)
 	}
 

internal/engine/sqlite/parse.go

@@ -17,7 +17,7 @@ type errorListener struct {
 	err string
 }
 
-func (el *errorListener) SyntaxError(recognizer antlr.Recognizer, offendingSymbol interface{}, line, column int, msg string, e antlr.RecognitionException) {
+func (el *errorListener) SyntaxError(recognizer antlr.Recognizer, offendingSymbol any, line, column int, msg string, e antlr.RecognitionException) {
 	el.err = msg
 }
 

internal/ext/wasm/wasm.go

@@ -59,7 +59,7 @@ func (r *Runner) loadAndCompile(ctx context.Context) (*runtimeAndCode, error) {
 	if err != nil {
 		return nil, err
 	}
-	value, err, _ := flight.Do(expected, func() (interface{}, error) {
+	value, err, _ := flight.Do(expected, func() (any, error) {
 		return r.loadAndCompileWASM(ctx, cacheDir, expected)
 	})
 	if err != nil {

internal/metadata/meta.go

@@ -59,7 +59,7 @@ func validateQueryName(name string) error {
 }
 
 func ParseQueryNameAndType(t string, commentStyle CommentSyntax) (string, string, error) {
-	for _, line := range strings.Split(t, "\n") {
+	for line := range strings.SplitSeq(t, "\n") {
 		var prefix string
 		if strings.HasPrefix(line, "--") {
 			if !commentStyle.Dash {

internal/opts/debug.go

@@ -39,7 +39,7 @@ func DebugFromString(val string) Debug {
 	if val == "" {
 		return d
 	}
-	for _, pair := range strings.Split(val, ",") {
+	for pair := range strings.SplitSeq(val, ",") {
 		pair = strings.TrimSpace(pair)
 		switch {
 		case pair == "dumpast=1":

internal/opts/experiment.go

@@ -47,7 +47,7 @@ func ExperimentFromString(val string) Experiment {
 		return e
 	}
 
-	for _, name := range strings.Split(val, ",") {
+	for name := range strings.SplitSeq(val, ",") {
 		name = strings.TrimSpace(name)
 		if name == "" {
 			continue