Skip to content

Commit bb22dc8

Browse files
neilotooleneilotoole
committed
WIP: vet warnings
1 parent ac2b955 commit bb22dc8

File tree

8 files changed

+33
-20
lines changed

8 files changed

+33
-20
lines changed

‎cli/cli_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ func TestCreateTable_bytes(t *testing.T) {
120120
data := []any{fixt.GopherFilename, fBytes}
121121

122122
require.Equal(t, int64(1), th.CreateTable(true, src, tblDef, data))
123-
t.Logf(src.Location)
123+
t.Log(src.Location)
124124
th.DropTable(src, tablefq.From(tblDef.Name))
125125
})
126126
}

‎cli/output/tablew/internal/texttable.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,7 @@ func (t *Table) printRow(columns [][]string, colKey int) {
513513
cellContent = PadRight(text, Space, t.cs[y])
514514
fmt.Fprintf(t.out, tran("%s "), cellContent)
515515
} else {
516-
fmt.Fprintf(t.out, tran(strings.TrimRightFunc(cellContent, unicode.IsSpace)))
516+
fmt.Fprint(t.out, tran(strings.TrimRightFunc(cellContent, unicode.IsSpace)))
517517
}
518518

519519
default:

‎cli/output/tablew/metadatawriter.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@ func (w *mdWriter) Catalogs(currentCatalog string, catalogs []string) error {
381381
var rows [][]string
382382
for _, catalog := range catalogs {
383383
if catalog == currentCatalog {
384-
catalog = pr.Active.Sprintf(catalog)
384+
catalog = pr.Active.Sprint(catalog)
385385
}
386386
rows = append(rows, []string{catalog})
387387
}
@@ -401,7 +401,7 @@ func (w *mdWriter) Catalogs(currentCatalog string, catalogs []string) error {
401401
for _, catalog := range catalogs {
402402
var active string
403403
if catalog == currentCatalog {
404-
catalog = pr.Active.Sprintf(catalog)
404+
catalog = pr.Active.Sprint(catalog)
405405
active = pr.Bool.Sprint("active")
406406
}
407407
rows = append(rows, []string{catalog, active})
@@ -425,7 +425,7 @@ func (w *mdWriter) Schemata(currentSchema string, schemas []*metadata.Schema) er
425425
for _, schema := range schemas {
426426
s := schema.Name
427427
if schema.Name == currentSchema {
428-
s = pr.Active.Sprintf(s)
428+
s = pr.Active.Sprint(s)
429429
}
430430
rows = append(rows, []string{s})
431431
}
@@ -448,7 +448,7 @@ func (w *mdWriter) Schemata(currentSchema string, schemas []*metadata.Schema) er
448448
row := []string{schema.Name, schema.Catalog, schema.Owner, ""}
449449

450450
if schema.Name == currentSchema {
451-
row[0] = pr.Active.Sprintf(row[0])
451+
row[0] = pr.Active.Sprint(row[0])
452452
row[3] = "active"
453453
}
454454
rows = append(rows, row)

‎cli/output/tablew/sourcewriter.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ func (w *sourceWriter) Collection(coll *source.Collection) error {
4747
}
4848

4949
if coll.Active() != nil && coll.Active().Handle == src.Handle {
50-
row[0] = pr.Active.Sprintf(row[0]) + pr.Faint.Sprint("*")
50+
row[0] = pr.Active.Sprint(row[0]) + pr.Faint.Sprint("*")
5151
}
5252

5353
rows = append(rows, row)
@@ -78,8 +78,8 @@ func (w *sourceWriter) Collection(coll *source.Collection) error {
7878
}
7979

8080
if coll.Active() != nil && coll.Active().Handle == src.Handle {
81-
row[0] = pr.Active.Sprintf(row[0])
82-
row[1] = pr.Bool.Sprintf("active")
81+
row[0] = pr.Active.Sprint(row[0])
82+
row[1] = pr.Bool.Sprint("active")
8383
}
8484

8585
rows = append(rows, row)
@@ -284,8 +284,8 @@ func (w *sourceWriter) renderGroups(groups []*source.Group) error {
284284
}
285285

286286
if g.Active {
287-
row[0] = pr.Active.Sprintf(row[0])
288-
row[5] = pr.Bool.Sprintf("active")
287+
row[0] = pr.Active.Sprint(row[0])
288+
row[5] = pr.Bool.Sprint("active")
289289
} else {
290290
// Don't render value for active==false. It's just noise.
291291
row[5] = ""
@@ -326,7 +326,7 @@ func rowEmptyZeroes(_ *output.Printing, row []string) {
326326
func rowFaintZeroes(pr *output.Printing, row []string) { //nolint:unused
327327
for i := range row {
328328
if row[i] == "0" {
329-
row[i] = pr.Faint.Sprintf(row[i])
329+
row[i] = pr.Faint.Sprint(row[i])
330330
}
331331
}
332332
}

‎drivers/sqlite3/testdata/sakila.db‎

0 Bytes
Binary file not shown.

‎go.mod‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/neilotoole/sq
22

3-
go 1.23.4
3+
go 1.25.5
44

55
require (
66
github.com/Masterminds/sprig/v3 v3.3.0
@@ -48,12 +48,12 @@ require (
4848
github.com/xo/dburl v0.23.2
4949
github.com/xuri/excelize/v2 v2.8.1
5050
go.uber.org/atomic v1.11.0
51-
golang.org/x/exp v0.0.0-20250103183323-7d7fa50e5329
52-
golang.org/x/mod v0.22.0
53-
golang.org/x/sync v0.10.0
54-
golang.org/x/sys v0.29.0
55-
golang.org/x/term v0.28.0
56-
golang.org/x/text v0.21.0
51+
golang.org/x/exp v0.0.0-20251219203646-944ab1f22d93
52+
golang.org/x/mod v0.31.0
53+
golang.org/x/sync v0.19.0
54+
golang.org/x/sys v0.39.0
55+
golang.org/x/term v0.38.0
56+
golang.org/x/text v0.32.0
5757
)
5858

5959
require (

‎go.sum‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,24 +227,37 @@ golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
227227
golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
228228
golang.org/x/exp v0.0.0-20250103183323-7d7fa50e5329 h1:9kj3STMvgqy3YA4VQXBrN7925ICMxD5wzMRcgA30588=
229229
golang.org/x/exp v0.0.0-20250103183323-7d7fa50e5329/go.mod h1:qj5a5QZpwLU2NLQudwIN5koi3beDhSAlJwa67PuM98c=
230+
golang.org/x/exp v0.0.0-20251219203646-944ab1f22d93 h1:fQsdNF2N+/YewlRZiricy4P1iimyPKZ/xwniHj8Q2a0=
231+
golang.org/x/exp v0.0.0-20251219203646-944ab1f22d93/go.mod h1:EPRbTFwzwjXj9NpYyyrvenVh9Y+GFeEvMNh7Xuz7xgU=
230232
golang.org/x/image v0.14.0 h1:tNgSxAFe3jC4uYqvZdTr84SZoM1KfwdC9SKIFrLjFn4=
231233
golang.org/x/image v0.14.0/go.mod h1:HUYqC05R2ZcZ3ejNQsIHQDQiwWM4JBqmm6MKANTp4LE=
232234
golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4=
233235
golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
236+
golang.org/x/mod v0.30.0/go.mod h1:lAsf5O2EvJeSFMiBxXDki7sCgAxEUcZHXoXMKT4GJKc=
237+
golang.org/x/mod v0.31.0 h1:HaW9xtz0+kOcWKwli0ZXy79Ix+UW/vOfmWI5QVd2tgI=
238+
golang.org/x/mod v0.31.0/go.mod h1:43JraMp9cGx1Rx3AqioxrbrhNsLl2l/iNAvuBkrezpg=
234239
golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
235240
golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
236241
golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
237242
golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
243+
golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4=
244+
golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
238245
golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
239246
golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
240247
golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
241248
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
242249
golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
243250
golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
251+
golang.org/x/sys v0.39.0 h1:CvCKL8MeisomCi6qNZ+wbb0DN9E5AATixKsvNtMoMFk=
252+
golang.org/x/sys v0.39.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
244253
golang.org/x/term v0.28.0 h1:/Ts8HFuMR2E6IP/jlo7QVLZHggjKQbhu/7H0LJFr3Gg=
245254
golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek=
255+
golang.org/x/term v0.38.0 h1:PQ5pkm/rLO6HnxFR7N2lJHOZX6Kez5Y1gDSJla6jo7Q=
256+
golang.org/x/term v0.38.0/go.mod h1:bSEAKrOT1W+VSu9TSCMtoGEOUcKxOKgl3LE5QEF/xVg=
246257
golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
247258
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
259+
golang.org/x/text v0.32.0 h1:ZD01bjUt1FQ9WJ0ClOL5vxgxOI/sVCNgX1YtKwcY0mU=
260+
golang.org/x/text v0.32.0/go.mod h1:o/rUWzghvpD5TXrTIBuJU77MTaN0ljMWE47kxGJQ7jY=
248261
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
249262
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
250263
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=

‎libsq/ast/parser_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ func TestParseBuild(t *testing.T) {
8383

8484
for i, tc := range testCases {
8585
t.Run(tu.Name(i, tc.name), func(t *testing.T) {
86-
t.Logf(tc.in)
86+
t.Log(tc.in)
8787
log := lgt.New(t)
8888

8989
ptree, err := parseSLQ(log, tc.in)

0 commit comments

Comments
 (0)