Skip to content

Commit 996ec04

Browse files
jonbodnerjonbodner
committedMay 2, 2023
switch to staticcheck. update imports (fixes some security issues). clean up issues found by staticcheck.
1 parent 0727729 commit 996ec04

9 files changed

+117
-60
lines changed
 

‎Makefile

+5-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ fmt:
2727
.PHONY:fmt
2828

2929
lint: fmt
30-
golint ./...
30+
staticcheck ./...
3131
.PHONY:lint
3232

3333
vet: fmt
@@ -37,3 +37,7 @@ vet: fmt
3737
build: vet
3838
go build github.com/jonbodner/proteus/cmd/sample
3939
.PHONY:build
40+
41+
install:
42+
go install honnef.co/go/tools/cmd/staticcheck@latest
43+
.PHONY:install

‎bench_test.go

+30-30
Original file line numberDiff line numberDiff line change
@@ -69,62 +69,62 @@ func setupDbPostgres() *sql.DB {
6969
}
7070

7171
func doPersonStuffForProteusTest(ctx context.Context, b *testing.B, wrapper ContextWrapper) (int64, *Person, []Person, error) {
72-
count, err := personDao.Create(ctx, wrapper, "Fred", 20)
72+
_, err := personDao.Create(ctx, wrapper, "Fred", 20)
7373
if err != nil {
7474
b.Fatalf("create failed: %v", err)
7575
}
7676

77-
count, err = personDao.Create(ctx, wrapper, "Bob", 50)
77+
_, err = personDao.Create(ctx, wrapper, "Bob", 50)
7878
if err != nil {
7979
b.Fatalf("create 2 failed: %v", err)
8080
}
8181

82-
count, err = personDao.Create(ctx, wrapper, "Julia", 32)
82+
_, err = personDao.Create(ctx, wrapper, "Julia", 32)
8383
if err != nil {
8484
b.Fatalf("create 3 failed: %v", err)
8585
}
8686

87-
count, err = personDao.Create(ctx, wrapper, "Pat", 37)
87+
_, err = personDao.Create(ctx, wrapper, "Pat", 37)
8888
if err != nil {
8989
b.Fatalf("create 4 failed: %v", err)
9090
}
9191

92-
person, err := personDao.Get(ctx, wrapper, 1)
92+
_, err = personDao.Get(ctx, wrapper, 1)
9393
if err != nil {
9494
b.Fatalf("get failed: %v", err)
9595
}
9696

97-
people, err := personDao.GetAll(ctx, wrapper)
97+
_, err = personDao.GetAll(ctx, wrapper)
9898
if err != nil {
9999
b.Fatalf("get all failed: %v", err)
100100
}
101101

102-
people, err = personDao.GetByAge(ctx, wrapper, 1, []int{20, 32}, "Fred")
102+
people, err := personDao.GetByAge(ctx, wrapper, 1, []int{20, 32}, "Fred")
103103
if err != nil {
104104
b.Fatalf("get by age failed: %v", err)
105105
}
106106

107-
count, err = personDao.Update(ctx, wrapper, 1, "Freddie", 30)
107+
_, err = personDao.Update(ctx, wrapper, 1, "Freddie", 30)
108108
if err != nil {
109109
b.Fatalf("update failed: %v", err)
110110
}
111111

112-
person, err = personDao.Get(ctx, wrapper, 1)
112+
_, err = personDao.Get(ctx, wrapper, 1)
113113
if err != nil {
114114
b.Fatalf("get 2 failed: %v", err)
115115
}
116116

117-
count, err = personDao.Delete(ctx, wrapper, 1)
117+
_, err = personDao.Delete(ctx, wrapper, 1)
118118
if err != nil {
119119
b.Fatalf("delete failed: %v", err)
120120
}
121121

122-
count, err = personDao.Delete(ctx, wrapper, 1)
122+
count, err := personDao.Delete(ctx, wrapper, 1)
123123
if err != nil {
124124
b.Fatalf("delete 2 failed: %v", err)
125125
}
126126

127-
person, err = personDao.Get(ctx, wrapper, 1)
127+
person, err := personDao.Get(ctx, wrapper, 1)
128128
if err != nil {
129129
b.Fatalf("get 3 failed: %v", err)
130130
}
@@ -145,7 +145,7 @@ func BenchmarkStandard(b *testing.B) {
145145

146146
type standardPersonDao struct{}
147147

148-
// `proq:"INSERT INTO PERSON(name, age) VALUES(:name:, :age:)" prop:"name,age"`
148+
// `proq:"INSERT INTO PERSON(name, age) VALUES(:name:, :age:)" prop:"name,age"`
149149
func (spd standardPersonDao) Create(db *sql.DB, name string, age int) (int64, error) {
150150
result, err := db.Exec("INSERT INTO PERSON(name, age) VALUES($1, $2)", name, age)
151151
if err != nil {
@@ -155,7 +155,7 @@ func (spd standardPersonDao) Create(db *sql.DB, name string, age int) (int64, er
155155
return count, err
156156
}
157157

158-
//`proq:"SELECT * FROM PERSON WHERE id = :id:" prop:"id"`
158+
// `proq:"SELECT * FROM PERSON WHERE id = :id:" prop:"id"`
159159
func (spd standardPersonDao) Get(db *sql.DB, id int) (*Person, error) {
160160
rows, err := db.Query("SELECT age, name, id FROM PERSON WHERE id = $1", id)
161161
if err != nil {
@@ -173,7 +173,7 @@ func (spd standardPersonDao) Get(db *sql.DB, id int) (*Person, error) {
173173
return p, err
174174
}
175175

176-
//`proq:"UPDATE PERSON SET name = :name:, age=:age: where id=:id:" prop:"id,name,age"`
176+
// `proq:"UPDATE PERSON SET name = :name:, age=:age: where id=:id:" prop:"id,name,age"`
177177
func (spd standardPersonDao) Update(db *sql.DB, id int, name string, age int) (int64, error) {
178178
result, err := db.Exec("UPDATE PERSON SET name = $1, age=$2 where id=$3", name, age, id)
179179
if err != nil {
@@ -183,7 +183,7 @@ func (spd standardPersonDao) Update(db *sql.DB, id int, name string, age int) (i
183183
return count, err
184184
}
185185

186-
//`proq:"DELETE FROM PERSON WHERE id = :id:" prop:"id"`
186+
// `proq:"DELETE FROM PERSON WHERE id = :id:" prop:"id"`
187187
func (spd standardPersonDao) Delete(db *sql.DB, id int) (int64, error) {
188188
result, err := db.Exec("DELETE FROM PERSON WHERE id = $1", id)
189189
if err != nil {
@@ -193,7 +193,7 @@ func (spd standardPersonDao) Delete(db *sql.DB, id int) (int64, error) {
193193
return count, err
194194
}
195195

196-
//`proq:"SELECT * FROM PERSON"`
196+
// `proq:"SELECT * FROM PERSON"`
197197
func (spd standardPersonDao) GetAll(db *sql.DB) ([]Person, error) {
198198
rows, err := db.Query("SELECT age, name, id FROM PERSON")
199199
if err != nil {
@@ -216,7 +216,7 @@ func (spd standardPersonDao) GetAll(db *sql.DB) ([]Person, error) {
216216
return out, err
217217
}
218218

219-
//`proq:"SELECT * from PERSON WHERE name=:name: and age in (:ages:) and id = :id:" prop:"id,ages,name"`
219+
// `proq:"SELECT * from PERSON WHERE name=:name: and age in (:ages:) and id = :id:" prop:"id,ages,name"`
220220
func (spd standardPersonDao) GetByAge(db *sql.DB, id int, ages []int, name string) ([]Person, error) {
221221
startQuery := "SELECT age, name, id from PERSON WHERE name=$1 and age in (:ages:) and id = :id:"
222222
params := make([]string, len(ages))
@@ -260,62 +260,62 @@ func (spd standardPersonDao) GetByAge(db *sql.DB, id int, ages []int, name strin
260260
var sPersonDao = standardPersonDao{}
261261

262262
func doPersonStuffForStandardTest(b *testing.B, db *sql.DB) (int64, *Person, []Person, error) {
263-
count, err := sPersonDao.Create(db, "Fred", 20)
263+
_, err := sPersonDao.Create(db, "Fred", 20)
264264
if err != nil {
265265
b.Fatalf("create failed: %v", err)
266266
}
267267

268-
count, err = sPersonDao.Create(db, "Bob", 50)
268+
_, err = sPersonDao.Create(db, "Bob", 50)
269269
if err != nil {
270270
b.Fatalf("create 2 failed: %v", err)
271271
}
272272

273-
count, err = sPersonDao.Create(db, "Julia", 32)
273+
_, err = sPersonDao.Create(db, "Julia", 32)
274274
if err != nil {
275275
b.Fatalf("create 3 failed: %v", err)
276276
}
277277

278-
count, err = sPersonDao.Create(db, "Pat", 37)
278+
_, err = sPersonDao.Create(db, "Pat", 37)
279279
if err != nil {
280280
b.Fatalf("create 4 failed: %v", err)
281281
}
282282

283-
person, err := sPersonDao.Get(db, 1)
283+
_, err = sPersonDao.Get(db, 1)
284284
if err != nil {
285285
b.Fatalf("get failed: %v", err)
286286
}
287287

288-
people, err := sPersonDao.GetAll(db)
288+
_, err = sPersonDao.GetAll(db)
289289
if err != nil {
290290
b.Fatalf("get all failed: %v", err)
291291
}
292292

293-
people, err = sPersonDao.GetByAge(db, 1, []int{20, 32}, "Fred")
293+
people, err := sPersonDao.GetByAge(db, 1, []int{20, 32}, "Fred")
294294
if err != nil {
295295
b.Fatalf("get by age failed: %v", err)
296296
}
297297

298-
count, err = sPersonDao.Update(db, 1, "Freddie", 30)
298+
_, err = sPersonDao.Update(db, 1, "Freddie", 30)
299299
if err != nil {
300300
b.Fatalf("update failed: %v", err)
301301
}
302302

303-
person, err = sPersonDao.Get(db, 1)
303+
_, err = sPersonDao.Get(db, 1)
304304
if err != nil {
305305
b.Fatalf("get 2 failed: %v", err)
306306
}
307307

308-
count, err = sPersonDao.Delete(db, 1)
308+
_, err = sPersonDao.Delete(db, 1)
309309
if err != nil {
310310
b.Fatalf("delete failed: %v", err)
311311
}
312312

313-
count, err = sPersonDao.Delete(db, 1)
313+
count, err := sPersonDao.Delete(db, 1)
314314
if err != nil {
315315
b.Fatalf("delete 2 failed: %v", err)
316316
}
317317

318-
person, err = sPersonDao.Get(db, 1)
318+
person, err := sPersonDao.Get(db, 1)
319319
if err != nil {
320320
b.Fatalf("get 3 failed: %v", err)
321321
}

‎builder_test.go

+17-3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package proteus
22

33
import (
44
"context"
5+
"github.com/google/go-cmp/cmp"
56
"reflect"
67
"testing"
78

@@ -61,12 +62,25 @@ func Test_buildParamMap(t *testing.T) {
6162
args args
6263
want map[string]int
6364
}{
64-
// TODO: Add test cases.
65+
{
66+
name: "simple",
67+
args: args{
68+
prop: "a,b,c",
69+
paramCount: 3,
70+
startPos: 1,
71+
},
72+
want: map[string]int{
73+
"a": 1,
74+
"b": 2,
75+
"c": 3,
76+
},
77+
},
6578
}
6679
for _, tt := range tests {
6780
t.Run(tt.name, func(t *testing.T) {
68-
if got := buildNameOrderMap(tt.args.prop, tt.args.startPos); !reflect.DeepEqual(got, tt.want) {
69-
t.Errorf("buildNameOrderMap() = %v, want %v", got, tt.want)
81+
got := buildNameOrderMap(tt.args.prop, tt.args.startPos)
82+
if diff := cmp.Diff(got, tt.want); diff != "" {
83+
t.Error(diff)
7084
}
7185
})
7286
}

‎go.mod

+14-8
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,23 @@
11
module github.com/jonbodner/proteus
22

3-
go 1.15
3+
go 1.19
44

55
require (
66
github.com/go-sql-driver/mysql v1.5.0
77
github.com/google/go-cmp v0.4.0
88
github.com/jonbodner/dbtimer v0.0.0-20170410163237-7002f3758ae1
9-
github.com/jonbodner/multierr v0.0.0-20200223210354-ace728439446
9+
github.com/jonbodner/multierr v1.0.0
1010
github.com/jonbodner/stackerr v1.0.0
11-
github.com/lib/pq v1.8.0
12-
github.com/pkg/profile v1.5.0
13-
github.com/rickar/props v0.0.0-20170718221555-0b06aeb2f037
14-
github.com/sirupsen/logrus v1.6.0
15-
github.com/stretchr/testify v1.3.0 // indirect
16-
golang.org/x/sys v0.0.0-20200828161417-c663848e9a16 // indirect
11+
github.com/lib/pq v1.10.9
12+
github.com/pkg/profile v1.7.0
13+
github.com/rickar/props v1.0.0
14+
github.com/sirupsen/logrus v1.9.0
15+
)
16+
17+
require (
18+
github.com/felixge/fgprof v0.9.3 // indirect
19+
github.com/google/pprof v0.0.0-20230429030804-905365eefe3e // indirect
20+
github.com/konsorten/go-windows-terminal-sequences v1.0.3 // indirect
21+
github.com/stretchr/testify v1.8.0 // indirect
22+
golang.org/x/sys v0.7.0 // indirect
1723
)

‎go.sum

+35-3
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,67 @@
1+
github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
2+
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
3+
github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
14
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
25
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
36
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
7+
github.com/felixge/fgprof v0.9.3 h1:VvyZxILNuCiUCSXtPtYmmtGvb65nqXh2QFWc0Wpf2/g=
8+
github.com/felixge/fgprof v0.9.3/go.mod h1:RdbpDgzqYVh/T9fPELJyV7EYJuHB55UTEULNun8eiPw=
49
github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs=
510
github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
611
github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4=
712
github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
13+
github.com/google/pprof v0.0.0-20211214055906-6f57359322fd/go.mod h1:KgnwoLYCZ8IQu3XUZ8Nc/bM9CCZFOyjUNOSygVozoDg=
14+
github.com/google/pprof v0.0.0-20230429030804-905365eefe3e h1:yuPVjc55Y343adYwQLA29DR8KrA0yuLJLlN5LxqlsgQ=
15+
github.com/google/pprof v0.0.0-20230429030804-905365eefe3e/go.mod h1:79YE0hCXdHag9sBkw2o+N/YnZtTkXi0UT9Nnixa5eYk=
16+
github.com/ianlancetaylor/demangle v0.0.0-20210905161508-09a460cdf81d/go.mod h1:aYm2/VgdVmcIU8iMfdMvDMsRAQjcfZSKFby6HOFvi/w=
817
github.com/jonbodner/dbtimer v0.0.0-20170410163237-7002f3758ae1 h1:mgFL7UFb88FOlSVgVoIRGJ4yKlkfp8KcXHqy7no+lEU=
918
github.com/jonbodner/dbtimer v0.0.0-20170410163237-7002f3758ae1/go.mod h1:PjOlFbeJKs+4b2CvuN9FFF8Ed8cZ6FHWPb5tLK2QKOM=
1019
github.com/jonbodner/multierr v0.0.0-20200223210354-ace728439446 h1:3JlpjXILq02AhL5iNC/T6M+UwkKvcKq7/h0LPYP+R44=
1120
github.com/jonbodner/multierr v0.0.0-20200223210354-ace728439446/go.mod h1:BN5BmT8XsFrnRDB/uErUiXlda9UQs2YhrlFFtf74JaM=
21+
github.com/jonbodner/multierr v1.0.0 h1:qgMyn9QNDnIKuPVOxAh4/kE8E0KBVtREEpzgQ+z6nR8=
22+
github.com/jonbodner/multierr v1.0.0/go.mod h1:BN5BmT8XsFrnRDB/uErUiXlda9UQs2YhrlFFtf74JaM=
1223
github.com/jonbodner/stackerr v1.0.0 h1:rAe+Fh13cfC9IGuKE4YWiVCzwt9zce9Saldpc8fYEIM=
1324
github.com/jonbodner/stackerr v1.0.0/go.mod h1:In1ShJr570PDuDHbYfymEQle+H7PgY9KpT+alyk0nEM=
1425
github.com/konsorten/go-windows-terminal-sequences v1.0.3 h1:CE8S1cTafDpPvMhIxNJKvHsGVBgn1xWYf1NbHQhywc8=
1526
github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
1627
github.com/lib/pq v1.8.0 h1:9xohqzkUwzR4Ga4ivdTcawVS89YSDVxXMa3xJX3cGzg=
1728
github.com/lib/pq v1.8.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
29+
github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
30+
github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
1831
github.com/pkg/profile v1.5.0 h1:042Buzk+NhDI+DeSAA62RwJL8VAuZUMQZUjCsRz1Mug=
1932
github.com/pkg/profile v1.5.0/go.mod h1:qBsxPvzyUincmltOk6iyRVxHYg4adc0OFOv72ZdLa18=
33+
github.com/pkg/profile v1.7.0 h1:hnbDkaNWPCLMO9wGLdBFTIZvzDrDfBM2072E1S9gJkA=
34+
github.com/pkg/profile v1.7.0/go.mod h1:8Uer0jas47ZQMJ7VD+OHknK4YDY07LPUC6dEvqDjvNo=
2035
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
2136
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
2237
github.com/rickar/props v0.0.0-20170718221555-0b06aeb2f037 h1:HFsTO5S+nnw/Xs9lRYF+UUJvH8wMSRMRal321W0hfdY=
2338
github.com/rickar/props v0.0.0-20170718221555-0b06aeb2f037/go.mod h1:F1p8BNM4IXv2UcptwSp8HJOapKurodd/PYu1D6Gtn9Y=
39+
github.com/rickar/props v1.0.0 h1:3C3j+wF2/XbQ/sCGRK8DkCLwuRvzqToMvDzmdxHwCsg=
40+
github.com/rickar/props v1.0.0/go.mod h1:VVywBJXdOY3IwDtBmgAMIZs/XM/CtMKSJzu5dsHYwEY=
2441
github.com/sirupsen/logrus v1.6.0 h1:UBcNElsrwanuuMsnGSlYmtmgbb23qDR5dG+6X6Oo89I=
2542
github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
43+
github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
44+
github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
2645
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
46+
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
2747
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
2848
github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
2949
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
30-
golang.org/x/sys v0.0.0-20190422165155-953cdadca894 h1:Cz4ceDQGXuKRnVBDTS23GTn/pU5OE2C0WrNTOYK1Uuc=
50+
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
51+
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
52+
github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
53+
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
3154
golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
32-
golang.org/x/sys v0.0.0-20200828161417-c663848e9a16 h1:54u1berWyLujz9htI1BHtZpcCEYaYNUSDFLXMNDd7To=
33-
golang.org/x/sys v0.0.0-20200828161417-c663848e9a16/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
55+
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
56+
golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
57+
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
58+
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab h1:2QkjZIsXupsJbJIdSjjUOgWK3aEtzyuh2mPt3l/CkeU=
59+
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
60+
golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU=
61+
golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
62+
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
3463
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
3564
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
65+
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
66+
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
67+
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

‎logger/logger.go

-5
Original file line numberDiff line numberDiff line change
@@ -111,11 +111,6 @@ func ValuesFromContext(c context.Context) ([]Pair, bool) {
111111
func Log(c context.Context, l Level, message string, vals ...Pair) {
112112
curLevelVal := c.Value(level)
113113
if curLevel, ok := curLevelVal.(Level); !ok || curLevel == OFF || curLevel > l {
114-
if !ok {
115-
//fmt.Println("Not going to log anything because no level is specified")
116-
} else {
117-
//fmt.Println("not going to log anything because curLevel is", curLevel, "and the logger is at level", l)
118-
}
119114
return
120115
}
121116
outVals := []interface{}{"time", time.Now().UTC(), "level", l, "message", message}

‎mapper_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -193,15 +193,15 @@ func TestBuildPrimitiveNilFail(t *testing.T) {
193193
sType := reflect.TypeOf("")
194194
c := logger.WithLevel(context.Background(), logger.DEBUG)
195195
b, _ := mapper.MakeBuilder(c, sType)
196-
s, err := mapRows(c, rows, b)
196+
_, err = mapRows(c, rows, b)
197197
if err == nil {
198198
t.Error("Expected error didn't get one")
199199
}
200200
if err.Error() != "attempting to return nil for non-pointer type string" {
201201
t.Errorf("Expected error message '%s', got '%s'", "attempting to return nil for non-pointer type string", err.Error())
202202
}
203203

204-
s, err = mapRows(c, rows, b)
204+
s, err := mapRows(c, rows, b)
205205
if s != nil || err != nil {
206206
t.Error("Expected to be at end, but wasn't")
207207
}

‎proteus_test.go

+12-7
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package proteus
33
import (
44
"context"
55
"errors"
6-
"fmt"
76
"reflect"
87
"testing"
98

@@ -394,6 +393,9 @@ func TestNoParams(t *testing.T) {
394393
t.Fatal(err)
395394
}
396395
count, err := result.RowsAffected()
396+
if err != nil {
397+
t.Fatal(err)
398+
}
397399
if count != 1 {
398400
t.Fatal("Should have modified 1 row")
399401
}
@@ -403,6 +405,9 @@ func TestNoParams(t *testing.T) {
403405
t.Fatal(err)
404406
}
405407
count, err = result.RowsAffected()
408+
if err != nil {
409+
t.Fatal(err)
410+
}
406411
if count != 1 {
407412
t.Fatal("Should have modified 1 row")
408413
}
@@ -604,7 +609,7 @@ func TestShouldBuildEmbeddedWithNullField(t *testing.T) {
604609
}
605610

606611
if prod.Name != "foo" {
607-
t.Fatal(fmt.Sprintf("Expected prod with name of foo, got %+v", prod))
612+
t.Fatalf("Expected prod with name of foo, got %+v", prod)
608613
}
609614

610615
if prod.EmptyField.Valid {
@@ -617,7 +622,7 @@ func TestShouldBuildEmbeddedWithNullField(t *testing.T) {
617622
t.Fatal(err)
618623
}
619624
if nestedProd.Name != "foo" {
620-
t.Fatal(fmt.Sprintf("Expected nested product name of foo, got %+v", prod))
625+
t.Fatalf("Expected nested product name of foo, got %+v", prod)
621626
}
622627

623628
if prod.EmptyField.Valid {
@@ -701,7 +706,7 @@ func TestVariableMultipleUsage(t *testing.T) {
701706
t.Fatal(err)
702707
}
703708
if prod.Name != "name" {
704-
t.Fatal(fmt.Sprintf("Expected prod with name, got %+v", prod))
709+
t.Fatalf("Expected prod with name, got %+v", prod)
705710
}
706711
}
707712

@@ -802,7 +807,7 @@ func TestShouldBuildEmbedded(t *testing.T) {
802807
t.Fatal(err)
803808
}
804809
if prod.Name != "foo" {
805-
t.Fatal(fmt.Sprintf("Expected prod with name, got %+v", prod))
810+
t.Fatalf("Expected prod with name, got %+v", prod)
806811
}
807812
}
808813
t.Run("postgres", func(t *testing.T) {
@@ -860,10 +865,10 @@ func TestShouldBinaryColumn(t *testing.T) {
860865
t.Fatal(err)
861866
}
862867
if prod.Name != "Foo" {
863-
t.Fatal(fmt.Sprintf("Expected prod with name, got %+v", prod))
868+
t.Fatalf("Expected prod with name, got %+v", prod)
864869
}
865870
if string(prod.Data) != "Hello" {
866-
t.Fatal(fmt.Sprintf("Expected prod with data, got %+v", prod))
871+
t.Fatalf("Expected prod with data, got %+v", prod)
867872
}
868873
}
869874
t.Run("postgres", func(t *testing.T) {

‎query_mappers.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ type propFileMapper struct {
1717
}
1818

1919
func (pm propFileMapper) Map(name string) string {
20-
return pm.properties.Get(name)
20+
val, _ := pm.properties.Get(name)
21+
return val
2122
}
2223

2324
func PropFileToQueryMapper(name string) (QueryMapper, error) {

0 commit comments

Comments
 (0)
Please sign in to comment.