Skip to content

Commit 055fcf5

Browse files
stephenafamostephenafamo
committed
Fix formatting and govet issues
1 parent 2c61dd3 commit 055fcf5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+485
-489
lines changed

‎boil/db.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,18 @@ import (
77

88
// Executor can perform SQL queries.
99
type Executor interface {
10-
Exec(query string, args ...interface{}) (sql.Result, error)
11-
Query(query string, args ...interface{}) (*sql.Rows, error)
12-
QueryRow(query string, args ...interface{}) *sql.Row
10+
Exec(query string, args ...any) (sql.Result, error)
11+
Query(query string, args ...any) (*sql.Rows, error)
12+
QueryRow(query string, args ...any) *sql.Row
1313
}
1414

1515
// ContextExecutor can perform SQL queries with context
1616
type ContextExecutor interface {
1717
Executor
1818

19-
ExecContext(ctx context.Context, query string, args ...interface{}) (sql.Result, error)
20-
QueryContext(ctx context.Context, query string, args ...interface{}) (*sql.Rows, error)
21-
QueryRowContext(ctx context.Context, query string, args ...interface{}) *sql.Row
19+
ExecContext(ctx context.Context, query string, args ...any) (sql.Result, error)
20+
QueryContext(ctx context.Context, query string, args ...any) (*sql.Rows, error)
21+
QueryRowContext(ctx context.Context, query string, args ...any) *sql.Row
2222
}
2323

2424
// 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) {
6666
}
6767

6868
return creator.BeginTx(ctx, opts)
69-
}
69+
}

‎boilingcore/boilingcore.go‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,11 @@ import (
1212
"sort"
1313
"strings"
1414

15-
"github.com/friendsofgo/errors"
16-
"github.com/aarondl/strmangle"
17-
1815
"github.com/aarondl/sqlboiler/v4/drivers"
1916
"github.com/aarondl/sqlboiler/v4/importers"
2017
boiltemplates "github.com/aarondl/sqlboiler/v4/templates"
18+
"github.com/aarondl/strmangle"
19+
"github.com/friendsofgo/errors"
2120
)
2221

2322
var (
@@ -409,7 +408,6 @@ func findTemplates(root, base string) (map[string]templateLoader, error) {
409408
templates[relative] = fileLoader(path)
410409
return nil
411410
})
412-
413411
if err != nil {
414412
return nil, err
415413
}
@@ -476,7 +474,6 @@ func (s *State) processTypeReplacements() error {
476474
}
477475

478476
for _, r := range s.Config.TypeReplaces {
479-
480477
for i := range s.Tables {
481478
t := s.Tables[i]
482479

@@ -742,7 +739,7 @@ func (s *State) verifyModVersion() error {
742739
}
743740
}
744741
if path == "" {
745-
return fmt.Errorf(fmt.Sprintf("could not find go.mod in any parent directory"))
742+
return fmt.Errorf("could not find go.mod in any parent directory")
746743
}
747744

748745
gomodbytes, err := os.ReadFile(path)
@@ -752,18 +749,16 @@ func (s *State) verifyModVersion() error {
752749

753750
re, err := regexp.Compile(`github\.com\/aarondl\/sqlboiler\/v4 v(\d*\.\d*\.\d*)`)
754751
if err != nil {
755-
return fmt.Errorf(fmt.Sprintf("failed to parse regexp: %v", err))
752+
return fmt.Errorf("failed to parse regexp: %v", err)
756753
}
757754

758755
match := re.FindSubmatch(gomodbytes)
759756
if len(match) == 0 {
760-
return fmt.Errorf(fmt.Sprintf("could not find sqlboiler version in go.mod"))
757+
return fmt.Errorf("could not find sqlboiler version in go.mod")
761758
}
762759
if string(match[1]) != s.Config.Version {
763760
return fmt.Errorf(
764-
"\tsqlboiler version in go.mod (%s) does not match executable version (%s)."+
765-
"\n\tYou can update it with:"+
766-
"\n\tgo get github.com/aarondl/sqlboiler/v4",
761+
"\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",
767762
string(match[0]),
768763
s.Config.Version,
769764
)

‎boilingcore/boilingcore_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ func testNew(t *testing.T, aliases Aliases) {
8181
PkgName: "models",
8282
OutFolder: out,
8383
NoTests: true,
84-
DriverConfig: map[string]interface{}{
84+
DriverConfig: map[string]any{
8585
drivers.ConfigSchema: "schema",
8686
drivers.ConfigBlacklist: []string{"hangars"},
8787
},
@@ -357,4 +357,4 @@ func TestProcessTypeReplacements(t *testing.T) {
357357
if disallowList := s.Config.DiscardedEnumTypes; len(strmangle.SetComplement(disallowList, expectedDisallows)) != 0 {
358358
t.Error("expected disallows:", disallowList)
359359
}
360-
}
360+
}

‎boilingcore/config.go‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ func (c *Config) OutputDirDepth() int {
144144
// name = "fkey_name"
145145
// local = "x"
146146
// foreign = "y"
147-
func ConvertAliases(i interface{}) (a Aliases) {
147+
func ConvertAliases(i any) (a Aliases) {
148148
if i == nil {
149149
return a
150150
}
@@ -153,7 +153,7 @@ func ConvertAliases(i interface{}) (a Aliases) {
153153

154154
tablesIntf := topLevel["tables"]
155155

156-
iterateMapOrSlice(tablesIntf, func(name string, tIntf interface{}) {
156+
iterateMapOrSlice(tablesIntf, func(name string, tIntf any) {
157157
if a.Tables == nil {
158158
a.Tables = make(map[string]TableAlias)
159159
}
@@ -178,10 +178,10 @@ func ConvertAliases(i interface{}) (a Aliases) {
178178
if colsIntf, ok := t["columns"]; ok {
179179
ta.Columns = make(map[string]string)
180180

181-
iterateMapOrSlice(colsIntf, func(name string, colIntf interface{}) {
181+
iterateMapOrSlice(colsIntf, func(name string, colIntf any) {
182182
var alias string
183183
switch col := colIntf.(type) {
184-
case map[string]interface{}, map[interface{}]interface{}:
184+
case map[string]any, map[any]any:
185185
cmap := cast.ToStringMap(colIntf)
186186
alias = cmap["alias"].(string)
187187
case string:
@@ -193,7 +193,7 @@ func ConvertAliases(i interface{}) (a Aliases) {
193193

194194
relationshipsIntf, ok := t["relationships"]
195195
if ok {
196-
iterateMapOrSlice(relationshipsIntf, func(name string, rIntf interface{}) {
196+
iterateMapOrSlice(relationshipsIntf, func(name string, rIntf any) {
197197
if ta.Relationships == nil {
198198
ta.Relationships = make(map[string]RelationshipAlias)
199199
}
@@ -218,14 +218,14 @@ func ConvertAliases(i interface{}) (a Aliases) {
218218
return a
219219
}
220220

221-
func iterateMapOrSlice(mapOrSlice interface{}, fn func(name string, obj interface{})) {
221+
func iterateMapOrSlice(mapOrSlice any, fn func(name string, obj any)) {
222222
switch t := mapOrSlice.(type) {
223-
case map[string]interface{}, map[interface{}]interface{}:
223+
case map[string]any, map[any]any:
224224
tmap := cast.ToStringMap(mapOrSlice)
225225
for name, table := range tmap {
226226
fn(name, table)
227227
}
228-
case []interface{}:
228+
case []any:
229229
for _, intf := range t {
230230
obj := cast.ToStringMap(intf)
231231
name := obj["name"].(string)
@@ -235,12 +235,12 @@ func iterateMapOrSlice(mapOrSlice interface{}, fn func(name string, obj interfac
235235
}
236236

237237
// ConvertTypeReplace is necessary because viper
238-
func ConvertTypeReplace(i interface{}) []TypeReplace {
238+
func ConvertTypeReplace(i any) []TypeReplace {
239239
if i == nil {
240240
return nil
241241
}
242242

243-
intfArray := i.([]interface{})
243+
intfArray := i.([]any)
244244
var replaces []TypeReplace
245245
for _, r := range intfArray {
246246
replaceIntf := cast.ToStringMap(r)
@@ -270,7 +270,7 @@ func ConvertTypeReplace(i interface{}) []TypeReplace {
270270
return replaces
271271
}
272272

273-
func tablesOfTypeReplace(i interface{}) []string {
273+
func tablesOfTypeReplace(i any) []string {
274274
tables := []string{}
275275

276276
m := cast.ToStringMap(i)
@@ -281,7 +281,7 @@ func tablesOfTypeReplace(i interface{}) []string {
281281
return tables
282282
}
283283

284-
func columnFromInterface(i interface{}) (col drivers.Column) {
284+
func columnFromInterface(i any) (col drivers.Column) {
285285
m := cast.ToStringMap(i)
286286
if s := m["name"]; s != nil {
287287
col.Name = s.(string)
@@ -335,12 +335,12 @@ func columnFromInterface(i interface{}) (col drivers.Column) {
335335
// column = "column_name"
336336
// foreign_table = "foreign_table_name"
337337
// foreign_column = "foreign_column_name"
338-
func ConvertForeignKeys(i interface{}) (fks []drivers.ForeignKey) {
338+
func ConvertForeignKeys(i any) (fks []drivers.ForeignKey) {
339339
if i == nil {
340340
return nil
341341
}
342342

343-
iterateMapOrSlice(i, func(name string, obj interface{}) {
343+
iterateMapOrSlice(i, func(name string, obj any) {
344344
t := cast.ToStringMap(obj)
345345

346346
fk := drivers.ForeignKey{
@@ -392,4 +392,4 @@ func validateDuplicateForeignKeys(fks []drivers.ForeignKey) error {
392392
fkMap[key] = fk
393393
}
394394
return nil
395-
}
395+
}

‎boilingcore/config_test.go‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -45,19 +45,19 @@ func TestConfig_OutputDirDepth(t *testing.T) {
4545
func TestConvertAliases(t *testing.T) {
4646
t.Parallel()
4747

48-
var intf interface{} = map[string]interface{}{
49-
"tables": map[string]interface{}{
50-
"table_name": map[string]interface{}{
48+
var intf any = map[string]any{
49+
"tables": map[string]any{
50+
"table_name": map[string]any{
5151
"up_plural": "a",
5252
"up_singular": "b",
5353
"down_plural": "c",
5454
"down_singular": "d",
5555

56-
"columns": map[string]interface{}{
56+
"columns": map[string]any{
5757
"a": "b",
5858
},
59-
"relationships": map[string]interface{}{
60-
"ib_fk_1": map[string]interface{}{
59+
"relationships": map[string]any{
60+
"ib_fk_1": map[string]any{
6161
"local": "a",
6262
"foreign": "b",
6363
},
@@ -110,23 +110,23 @@ func TestConvertAliases(t *testing.T) {
110110
func TestConvertAliasesAltSyntax(t *testing.T) {
111111
t.Parallel()
112112

113-
var intf interface{} = map[string]interface{}{
114-
"tables": []interface{}{
115-
map[string]interface{}{
113+
var intf any = map[string]any{
114+
"tables": []any{
115+
map[string]any{
116116
"name": "table_name",
117117
"up_plural": "a",
118118
"up_singular": "b",
119119
"down_plural": "c",
120120
"down_singular": "d",
121121

122-
"columns": []interface{}{
123-
map[string]interface{}{
122+
"columns": []any{
123+
map[string]any{
124124
"name": "a",
125125
"alias": "b",
126126
},
127127
},
128-
"relationships": []interface{}{
129-
map[string]interface{}{
128+
"relationships": []any{
129+
map[string]any{
130130
"name": "ib_fk_1",
131131
"local": "a",
132132
"foreign": "b",
@@ -180,7 +180,7 @@ func TestConvertAliasesAltSyntax(t *testing.T) {
180180
func TestConvertTypeReplace(t *testing.T) {
181181
t.Parallel()
182182

183-
fullColumn := map[string]interface{}{
183+
fullColumn := map[string]any{
184184
"name": "a",
185185
"type": "b",
186186
"db_type": "c",
@@ -192,15 +192,15 @@ func TestConvertTypeReplace(t *testing.T) {
192192
"nullable": true,
193193
}
194194

195-
var intf interface{} = []interface{}{
196-
map[string]interface{}{
195+
var intf any = []any{
196+
map[string]any{
197197
"match": fullColumn,
198198
"replace": fullColumn,
199-
"imports": map[string]interface{}{
200-
"standard": []interface{}{
199+
"imports": map[string]any{
200+
"standard": []any{
201201
"abc",
202202
},
203-
"third_party": []interface{}{
203+
"third_party": []any{
204204
"github.com/abc",
205205
},
206206
},
@@ -258,8 +258,8 @@ func TestConvertTypeReplace(t *testing.T) {
258258
func TestConvertForeignKeys(t *testing.T) {
259259
t.Parallel()
260260

261-
var intf interface{} = map[string]interface{}{
262-
"fk_1": map[string]interface{}{
261+
var intf any = map[string]any{
262+
"fk_1": map[string]any{
263263
"table": "table_name",
264264
"column": "column_name",
265265
"foreign_table": "foreign_table_name",
@@ -289,8 +289,8 @@ func TestConvertForeignKeys(t *testing.T) {
289289
func TestConvertForeignKeysAltSyntax(t *testing.T) {
290290
t.Parallel()
291291

292-
var intf interface{} = []interface{}{
293-
map[string]interface{}{
292+
var intf any = []any{
293+
map[string]any{
294294
"name": "fk_1",
295295
"table": "table_name",
296296
"column": "column_name",
@@ -316,4 +316,4 @@ func TestConvertForeignKeysAltSyntax(t *testing.T) {
316316
if fk != expectedFK {
317317
t.Error("value was wrong:", fk)
318318
}
319-
}
319+
}

‎boilingcore/output_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,12 +170,12 @@ func TestGetOutputFilename(t *testing.T) {
170170
t.Run(name, func(t *testing.T) {
171171
notTest := getOutputFilename(tc.TableName, false, tc.IsGo)
172172
if diff := cmp.Diff(tc.Expected, notTest); diff != "" {
173-
t.Fatalf(diff)
173+
t.Fatal(diff)
174174
}
175175

176176
isTest := getOutputFilename(tc.TableName, true, tc.IsGo)
177177
if diff := cmp.Diff(tc.Expected+"_test", isTest); diff != "" {
178-
t.Fatalf(diff)
178+
t.Fatal(diff)
179179
}
180180
})
181181
}

‎drivers/binary_driver.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ func (b binaryDriver) Imports() (col importers.Collection, err error) {
4848
return col, nil
4949
}
5050

51-
func execute(executable, method string, input interface{}, output interface{}, errStream io.Writer) error {
51+
func execute(executable, method string, input any, output any, errStream io.Writer) error {
5252
var err error
5353
var inputBytes []byte
5454
if input != nil {
@@ -82,4 +82,4 @@ func execute(executable, method string, input interface{}, output interface{}, e
8282
}
8383

8484
return nil
85-
}
85+
}

0 commit comments

Comments
 (0)