Merge pull request #1461 from aarondl/minor-fixes

Fix formatting and govet issues

Author: stephenafamo

boil/db.go

@@ -7,18 +7,18 @@ import (
 
 // Executor can perform SQL queries.
 type Executor interface {
-	Exec(query string, args ...interface{}) (sql.Result, error)
-	Query(query string, args ...interface{}) (*sql.Rows, error)
-	QueryRow(query string, args ...interface{}) *sql.Row
+	Exec(query string, args ...any) (sql.Result, error)
+	Query(query string, args ...any) (*sql.Rows, error)
+	QueryRow(query string, args ...any) *sql.Row
 }
 
 // ContextExecutor can perform SQL queries with context
 type ContextExecutor interface {
 	Executor
 
-	ExecContext(ctx context.Context, query string, args ...interface{}) (sql.Result, error)
-	QueryContext(ctx context.Context, query string, args ...interface{}) (*sql.Rows, error)
-	QueryRowContext(ctx context.Context, query string, args ...interface{}) *sql.Row
+	ExecContext(ctx context.Context, query string, args ...any) (sql.Result, error)
+	QueryContext(ctx context.Context, query string, args ...any) (*sql.Rows, error)
+	QueryRowContext(ctx context.Context, query string, args ...any) *sql.Row
 }
 
 // Transactor can commit and rollback, on top of being able to execute queries.
@@ -66,4 +66,4 @@ func BeginTx(ctx context.Context, opts *sql.TxOptions) (*sql.Tx, error) {
 	}
 
 	return creator.BeginTx(ctx, opts)
-}
+}

boilingcore/boilingcore.go

@@ -12,12 +12,11 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/friendsofgo/errors"
-	"github.com/aarondl/strmangle"
-
 	"github.com/aarondl/sqlboiler/v4/drivers"
 	"github.com/aarondl/sqlboiler/v4/importers"
 	boiltemplates "github.com/aarondl/sqlboiler/v4/templates"
+	"github.com/aarondl/strmangle"
+	"github.com/friendsofgo/errors"
 )
 
 var (
@@ -409,7 +408,6 @@ func findTemplates(root, base string) (map[string]templateLoader, error) {
 		templates[relative] = fileLoader(path)
 		return nil
 	})
-
 	if err != nil {
 		return nil, err
 	}
@@ -476,7 +474,6 @@ func (s *State) processTypeReplacements() error {
 	}
 
 	for _, r := range s.Config.TypeReplaces {
-
 		for i := range s.Tables {
 			t := s.Tables[i]
 
@@ -742,7 +739,7 @@ func (s *State) verifyModVersion() error {
 		}
 	}
 	if path == "" {
-		return fmt.Errorf(fmt.Sprintf("could not find go.mod in any parent directory"))
+		return fmt.Errorf("could not find go.mod in any parent directory")
 	}
 
 	gomodbytes, err := os.ReadFile(path)
@@ -752,18 +749,16 @@ func (s *State) verifyModVersion() error {
 
 	re, err := regexp.Compile(`github\.com\/aarondl\/sqlboiler\/v4 v(\d*\.\d*\.\d*)`)
 	if err != nil {
-		return fmt.Errorf(fmt.Sprintf("failed to parse regexp: %v", err))
+		return fmt.Errorf("failed to parse regexp: %v", err)
 	}
 
 	match := re.FindSubmatch(gomodbytes)
 	if len(match) == 0 {
-		return fmt.Errorf(fmt.Sprintf("could not find sqlboiler version in go.mod"))
+		return fmt.Errorf("could not find sqlboiler version in go.mod")
 	}
 	if string(match[1]) != s.Config.Version {
 		return fmt.Errorf(
-			"\tsqlboiler version in go.mod (%s) does not match executable version (%s)."+
-				"\n\tYou can update it with:"+
-				"\n\tgo get github.com/aarondl/sqlboiler/v4",
+			"\tsqlboiler version in go.mod (%s) does not match executable version (%s).\n\tYou can update it with:\n\tgo get github.com/aarondl/sqlboiler/v4",
 			string(match[0]),
 			s.Config.Version,
 		)

boilingcore/boilingcore_test.go

@@ -81,7 +81,7 @@ func testNew(t *testing.T, aliases Aliases) {
 		PkgName:    "models",
 		OutFolder:  out,
 		NoTests:    true,
-		DriverConfig: map[string]interface{}{
+		DriverConfig: map[string]any{
 			drivers.ConfigSchema:    "schema",
 			drivers.ConfigBlacklist: []string{"hangars"},
 		},
@@ -357,4 +357,4 @@ func TestProcessTypeReplacements(t *testing.T) {
 	if disallowList := s.Config.DiscardedEnumTypes; len(strmangle.SetComplement(disallowList, expectedDisallows)) != 0 {
 		t.Error("expected disallows:", disallowList)
 	}
-}
+}

boilingcore/config.go

@@ -144,7 +144,7 @@ func (c *Config) OutputDirDepth() int {
 //	  name    = "fkey_name"
 //	  local   = "x"
 //	  foreign = "y"
-func ConvertAliases(i interface{}) (a Aliases) {
+func ConvertAliases(i any) (a Aliases) {
 	if i == nil {
 		return a
 	}
@@ -153,7 +153,7 @@ func ConvertAliases(i interface{}) (a Aliases) {
 
 	tablesIntf := topLevel["tables"]
 
-	iterateMapOrSlice(tablesIntf, func(name string, tIntf interface{}) {
+	iterateMapOrSlice(tablesIntf, func(name string, tIntf any) {
 		if a.Tables == nil {
 			a.Tables = make(map[string]TableAlias)
 		}
@@ -178,10 +178,10 @@ func ConvertAliases(i interface{}) (a Aliases) {
 		if colsIntf, ok := t["columns"]; ok {
 			ta.Columns = make(map[string]string)
 
-			iterateMapOrSlice(colsIntf, func(name string, colIntf interface{}) {
+			iterateMapOrSlice(colsIntf, func(name string, colIntf any) {
 				var alias string
 				switch col := colIntf.(type) {
-				case map[string]interface{}, map[interface{}]interface{}:
+				case map[string]any, map[any]any:
 					cmap := cast.ToStringMap(colIntf)
 					alias = cmap["alias"].(string)
 				case string:
@@ -193,7 +193,7 @@ func ConvertAliases(i interface{}) (a Aliases) {
 
 		relationshipsIntf, ok := t["relationships"]
 		if ok {
-			iterateMapOrSlice(relationshipsIntf, func(name string, rIntf interface{}) {
+			iterateMapOrSlice(relationshipsIntf, func(name string, rIntf any) {
 				if ta.Relationships == nil {
 					ta.Relationships = make(map[string]RelationshipAlias)
 				}
@@ -218,14 +218,14 @@ func ConvertAliases(i interface{}) (a Aliases) {
 	return a
 }
 
-func iterateMapOrSlice(mapOrSlice interface{}, fn func(name string, obj interface{})) {
+func iterateMapOrSlice(mapOrSlice any, fn func(name string, obj any)) {
 	switch t := mapOrSlice.(type) {
-	case map[string]interface{}, map[interface{}]interface{}:
+	case map[string]any, map[any]any:
 		tmap := cast.ToStringMap(mapOrSlice)
 		for name, table := range tmap {
 			fn(name, table)
 		}
-	case []interface{}:
+	case []any:
 		for _, intf := range t {
 			obj := cast.ToStringMap(intf)
 			name := obj["name"].(string)
@@ -235,12 +235,12 @@ func iterateMapOrSlice(mapOrSlice interface{}, fn func(name string, obj interfac
 }
 
 // ConvertTypeReplace is necessary because viper
-func ConvertTypeReplace(i interface{}) []TypeReplace {
+func ConvertTypeReplace(i any) []TypeReplace {
 	if i == nil {
 		return nil
 	}
 
-	intfArray := i.([]interface{})
+	intfArray := i.([]any)
 	var replaces []TypeReplace
 	for _, r := range intfArray {
 		replaceIntf := cast.ToStringMap(r)
@@ -270,7 +270,7 @@ func ConvertTypeReplace(i interface{}) []TypeReplace {
 	return replaces
 }
 
-func tablesOfTypeReplace(i interface{}) []string {
+func tablesOfTypeReplace(i any) []string {
 	tables := []string{}
 
 	m := cast.ToStringMap(i)
@@ -281,7 +281,7 @@ func tablesOfTypeReplace(i interface{}) []string {
 	return tables
 }
 
-func columnFromInterface(i interface{}) (col drivers.Column) {
+func columnFromInterface(i any) (col drivers.Column) {
 	m := cast.ToStringMap(i)
 	if s := m["name"]; s != nil {
 		col.Name = s.(string)
@@ -335,12 +335,12 @@ func columnFromInterface(i interface{}) (col drivers.Column) {
 //	column = "column_name"
 //	foreign_table = "foreign_table_name"
 //	foreign_column = "foreign_column_name"
-func ConvertForeignKeys(i interface{}) (fks []drivers.ForeignKey) {
+func ConvertForeignKeys(i any) (fks []drivers.ForeignKey) {
 	if i == nil {
 		return nil
 	}
 
-	iterateMapOrSlice(i, func(name string, obj interface{}) {
+	iterateMapOrSlice(i, func(name string, obj any) {
 		t := cast.ToStringMap(obj)
 
 		fk := drivers.ForeignKey{
@@ -392,4 +392,4 @@ func validateDuplicateForeignKeys(fks []drivers.ForeignKey) error {
 		fkMap[key] = fk
 	}
 	return nil
-}
+}

boilingcore/config_test.go

@@ -45,19 +45,19 @@ func TestConfig_OutputDirDepth(t *testing.T) {
 func TestConvertAliases(t *testing.T) {
 	t.Parallel()
 
-	var intf interface{} = map[string]interface{}{
-		"tables": map[string]interface{}{
-			"table_name": map[string]interface{}{
+	var intf any = map[string]any{
+		"tables": map[string]any{
+			"table_name": map[string]any{
 				"up_plural":     "a",
 				"up_singular":   "b",
 				"down_plural":   "c",
 				"down_singular": "d",
 
-				"columns": map[string]interface{}{
+				"columns": map[string]any{
 					"a": "b",
 				},
-				"relationships": map[string]interface{}{
-					"ib_fk_1": map[string]interface{}{
+				"relationships": map[string]any{
+					"ib_fk_1": map[string]any{
 						"local":   "a",
 						"foreign": "b",
 					},
@@ -110,23 +110,23 @@ func TestConvertAliases(t *testing.T) {
 func TestConvertAliasesAltSyntax(t *testing.T) {
 	t.Parallel()
 
-	var intf interface{} = map[string]interface{}{
-		"tables": []interface{}{
-			map[string]interface{}{
+	var intf any = map[string]any{
+		"tables": []any{
+			map[string]any{
 				"name":          "table_name",
 				"up_plural":     "a",
 				"up_singular":   "b",
 				"down_plural":   "c",
 				"down_singular": "d",
 
-				"columns": []interface{}{
-					map[string]interface{}{
+				"columns": []any{
+					map[string]any{
 						"name":  "a",
 						"alias": "b",
 					},
 				},
-				"relationships": []interface{}{
-					map[string]interface{}{
+				"relationships": []any{
+					map[string]any{
 						"name":    "ib_fk_1",
 						"local":   "a",
 						"foreign": "b",
@@ -180,7 +180,7 @@ func TestConvertAliasesAltSyntax(t *testing.T) {
 func TestConvertTypeReplace(t *testing.T) {
 	t.Parallel()
 
-	fullColumn := map[string]interface{}{
+	fullColumn := map[string]any{
 		"name":           "a",
 		"type":           "b",
 		"db_type":        "c",
@@ -192,15 +192,15 @@ func TestConvertTypeReplace(t *testing.T) {
 		"nullable":       true,
 	}
 
-	var intf interface{} = []interface{}{
-		map[string]interface{}{
+	var intf any = []any{
+		map[string]any{
 			"match":   fullColumn,
 			"replace": fullColumn,
-			"imports": map[string]interface{}{
-				"standard": []interface{}{
+			"imports": map[string]any{
+				"standard": []any{
 					"abc",
 				},
-				"third_party": []interface{}{
+				"third_party": []any{
 					"github.com/abc",
 				},
 			},
@@ -258,8 +258,8 @@ func TestConvertTypeReplace(t *testing.T) {
 func TestConvertForeignKeys(t *testing.T) {
 	t.Parallel()
 
-	var intf interface{} = map[string]interface{}{
-		"fk_1": map[string]interface{}{
+	var intf any = map[string]any{
+		"fk_1": map[string]any{
 			"table":          "table_name",
 			"column":         "column_name",
 			"foreign_table":  "foreign_table_name",
@@ -289,8 +289,8 @@ func TestConvertForeignKeys(t *testing.T) {
 func TestConvertForeignKeysAltSyntax(t *testing.T) {
 	t.Parallel()
 
-	var intf interface{} = []interface{}{
-		map[string]interface{}{
+	var intf any = []any{
+		map[string]any{
 			"name":           "fk_1",
 			"table":          "table_name",
 			"column":         "column_name",
@@ -316,4 +316,4 @@ func TestConvertForeignKeysAltSyntax(t *testing.T) {
 	if fk != expectedFK {
 		t.Error("value was wrong:", fk)
 	}
-}
+}

boilingcore/output_test.go

@@ -170,12 +170,12 @@ func TestGetOutputFilename(t *testing.T) {
 		t.Run(name, func(t *testing.T) {
 			notTest := getOutputFilename(tc.TableName, false, tc.IsGo)
 			if diff := cmp.Diff(tc.Expected, notTest); diff != "" {
-				t.Fatalf(diff)
+				t.Fatal(diff)
 			}
 
 			isTest := getOutputFilename(tc.TableName, true, tc.IsGo)
 			if diff := cmp.Diff(tc.Expected+"_test", isTest); diff != "" {
-				t.Fatalf(diff)
+				t.Fatal(diff)
 			}
 		})
 	}

drivers/binary_driver.go

@@ -48,7 +48,7 @@ func (b binaryDriver) Imports() (col importers.Collection, err error) {
 	return col, nil
 }
 
-func execute(executable, method string, input interface{}, output interface{}, errStream io.Writer) error {
+func execute(executable, method string, input any, output any, errStream io.Writer) error {
 	var err error
 	var inputBytes []byte
 	if input != nil {
@@ -82,4 +82,4 @@ func execute(executable, method string, input interface{}, output interface{}, e
 	}
 
 	return nil
-}
+}