Skip to content

Commit 1a9b2a5

Browse files
jackcjackc
committed
Fix staticcheck issues
1 parent 8fb309c commit 1a9b2a5

File tree

8 files changed

+34
-37
lines changed

8 files changed

+34
-37
lines changed

‎conn.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -507,7 +507,7 @@ func (c *Conn) execSimpleProtocol(ctx context.Context, sql string, arguments []a
507507

508508
mrr := c.pgConn.Exec(ctx, sql)
509509
for mrr.NextResult() {
510-
commandTag, err = mrr.ResultReader().Close()
510+
commandTag, _ = mrr.ResultReader().Close()
511511
}
512512
err = mrr.Close()
513513
return commandTag, err

‎conn_test.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ func TestExecContextWithoutCancelation(t *testing.T) {
315315
defer cancel()
316316

317317
pgxtest.RunWithQueryExecModes(ctx, t, defaultConnTestRunner, nil, func(ctx context.Context, t testing.TB, conn *pgx.Conn) {
318-
ctx, cancelFunc := context.WithCancel(context.Background())
318+
ctx, cancelFunc := context.WithCancel(ctx)
319319
defer cancelFunc()
320320

321321
commandTag, err := conn.Exec(ctx, "create temporary table foo(id integer primary key);")
@@ -336,7 +336,7 @@ func TestExecContextFailureWithoutCancelation(t *testing.T) {
336336
defer cancel()
337337

338338
pgxtest.RunWithQueryExecModes(ctx, t, defaultConnTestRunner, nil, func(ctx context.Context, t testing.TB, conn *pgx.Conn) {
339-
ctx, cancelFunc := context.WithCancel(context.Background())
339+
ctx, cancelFunc := context.WithCancel(ctx)
340340
defer cancelFunc()
341341

342342
_, err := conn.Exec(ctx, "selct;")
@@ -361,7 +361,7 @@ func TestExecContextFailureWithoutCancelationWithArguments(t *testing.T) {
361361
defer cancel()
362362

363363
pgxtest.RunWithQueryExecModes(ctx, t, defaultConnTestRunner, nil, func(ctx context.Context, t testing.TB, conn *pgx.Conn) {
364-
ctx, cancelFunc := context.WithCancel(context.Background())
364+
ctx, cancelFunc := context.WithCancel(ctx)
365365
defer cancelFunc()
366366

367367
_, err := conn.Exec(ctx, "selct $1;", 1)
@@ -565,6 +565,7 @@ func TestListenNotify(t *testing.T) {
565565
defer cancel()
566566
notification, err = listener.WaitForNotification(ctx)
567567
assert.True(t, pgconn.Timeout(err))
568+
assert.Nil(t, notification)
568569

569570
// listener can listen again after a timeout
570571
mustExec(t, notifier, "notify chat")

‎query_test.go

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -656,16 +656,9 @@ func TestQueryRowCoreIntegerEncoding(t *testing.T) {
656656
defer closeConn(t, conn)
657657

658658
type allTypes struct {
659-
ui uint
660-
ui8 uint8
661-
ui16 uint16
662-
ui32 uint32
663-
ui64 uint64
664-
i int
665-
i8 int8
666-
i16 int16
667-
i32 int32
668-
i64 int64
659+
i16 int16
660+
i32 int32
661+
i64 int64
669662
}
670663

671664
var actual, zero allTypes
@@ -983,7 +976,6 @@ func TestQueryRowErrors(t *testing.T) {
983976

984977
type allTypes struct {
985978
i16 int16
986-
i int
987979
s string
988980
}
989981

‎rows.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ func (rows *baseRows) Values() ([]any, error) {
306306
copy(newBuf, buf)
307307
values = append(values, newBuf)
308308
default:
309-
rows.fatal(errors.New("Unknown format code"))
309+
rows.fatal(errors.New("unknown format code"))
310310
}
311311
}
312312

‎rows_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,7 @@ func TestCollectOneRowPrefersPostgreSQLErrorOverErrNoRows(t *testing.T) {
270270
var pgErr *pgconn.PgError
271271
require.ErrorAs(t, err, &pgErr)
272272
require.Equal(t, "23505", pgErr.Code)
273+
require.Equal(t, "", name)
273274
})
274275
}
275276

‎tracer_test.go

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ type testTracer struct {
2424
traceConnectEnd func(ctx context.Context, data pgx.TraceConnectEndData)
2525
}
2626

27+
type ctxKey string
28+
2729
func (tt *testTracer) TraceQueryStart(ctx context.Context, conn *pgx.Conn, data pgx.TraceQueryStartData) context.Context {
2830
if tt.traceQueryStart != nil {
2931
return tt.traceQueryStart(ctx, conn, data)
@@ -117,13 +119,13 @@ func TestTraceExec(t *testing.T) {
117119
require.Equal(t, `select $1::text`, data.SQL)
118120
require.Len(t, data.Args, 1)
119121
require.Equal(t, `testing`, data.Args[0])
120-
return context.WithValue(ctx, "fromTraceQueryStart", "foo")
122+
return context.WithValue(ctx, ctxKey(ctxKey("fromTraceQueryStart")), "foo")
121123
}
122124

123125
traceQueryEndCalled := false
124126
tracer.traceQueryEnd = func(ctx context.Context, conn *pgx.Conn, data pgx.TraceQueryEndData) {
125127
traceQueryEndCalled = true
126-
require.Equal(t, "foo", ctx.Value("fromTraceQueryStart"))
128+
require.Equal(t, "foo", ctx.Value(ctxKey(ctxKey("fromTraceQueryStart"))))
127129
require.Equal(t, `SELECT 1`, data.CommandTag.String())
128130
require.NoError(t, data.Err)
129131
}
@@ -157,13 +159,13 @@ func TestTraceQuery(t *testing.T) {
157159
require.Equal(t, `select $1::text`, data.SQL)
158160
require.Len(t, data.Args, 1)
159161
require.Equal(t, `testing`, data.Args[0])
160-
return context.WithValue(ctx, "fromTraceQueryStart", "foo")
162+
return context.WithValue(ctx, ctxKey("fromTraceQueryStart"), "foo")
161163
}
162164

163165
traceQueryEndCalled := false
164166
tracer.traceQueryEnd = func(ctx context.Context, conn *pgx.Conn, data pgx.TraceQueryEndData) {
165167
traceQueryEndCalled = true
166-
require.Equal(t, "foo", ctx.Value("fromTraceQueryStart"))
168+
require.Equal(t, "foo", ctx.Value(ctxKey("fromTraceQueryStart")))
167169
require.Equal(t, `SELECT 1`, data.CommandTag.String())
168170
require.NoError(t, data.Err)
169171
}
@@ -198,20 +200,20 @@ func TestTraceBatchNormal(t *testing.T) {
198200
traceBatchStartCalled = true
199201
require.NotNil(t, data.Batch)
200202
require.Equal(t, 2, data.Batch.Len())
201-
return context.WithValue(ctx, "fromTraceBatchStart", "foo")
203+
return context.WithValue(ctx, ctxKey("fromTraceBatchStart"), "foo")
202204
}
203205

204206
traceBatchQueryCalledCount := 0
205207
tracer.traceBatchQuery = func(ctx context.Context, conn *pgx.Conn, data pgx.TraceBatchQueryData) {
206208
traceBatchQueryCalledCount++
207-
require.Equal(t, "foo", ctx.Value("fromTraceBatchStart"))
209+
require.Equal(t, "foo", ctx.Value(ctxKey("fromTraceBatchStart")))
208210
require.NoError(t, data.Err)
209211
}
210212

211213
traceBatchEndCalled := false
212214
tracer.traceBatchEnd = func(ctx context.Context, conn *pgx.Conn, data pgx.TraceBatchEndData) {
213215
traceBatchEndCalled = true
214-
require.Equal(t, "foo", ctx.Value("fromTraceBatchStart"))
216+
require.Equal(t, "foo", ctx.Value(ctxKey("fromTraceBatchStart")))
215217
require.NoError(t, data.Err)
216218
}
217219

@@ -261,20 +263,20 @@ func TestTraceBatchClose(t *testing.T) {
261263
traceBatchStartCalled = true
262264
require.NotNil(t, data.Batch)
263265
require.Equal(t, 2, data.Batch.Len())
264-
return context.WithValue(ctx, "fromTraceBatchStart", "foo")
266+
return context.WithValue(ctx, ctxKey("fromTraceBatchStart"), "foo")
265267
}
266268

267269
traceBatchQueryCalledCount := 0
268270
tracer.traceBatchQuery = func(ctx context.Context, conn *pgx.Conn, data pgx.TraceBatchQueryData) {
269271
traceBatchQueryCalledCount++
270-
require.Equal(t, "foo", ctx.Value("fromTraceBatchStart"))
272+
require.Equal(t, "foo", ctx.Value(ctxKey("fromTraceBatchStart")))
271273
require.NoError(t, data.Err)
272274
}
273275

274276
traceBatchEndCalled := false
275277
tracer.traceBatchEnd = func(ctx context.Context, conn *pgx.Conn, data pgx.TraceBatchEndData) {
276278
traceBatchEndCalled = true
277-
require.Equal(t, "foo", ctx.Value("fromTraceBatchStart"))
279+
require.Equal(t, "foo", ctx.Value(ctxKey("fromTraceBatchStart")))
278280
require.NoError(t, data.Err)
279281
}
280282

@@ -312,13 +314,13 @@ func TestTraceBatchErrorWhileReadingResults(t *testing.T) {
312314
traceBatchStartCalled = true
313315
require.NotNil(t, data.Batch)
314316
require.Equal(t, 3, data.Batch.Len())
315-
return context.WithValue(ctx, "fromTraceBatchStart", "foo")
317+
return context.WithValue(ctx, ctxKey("fromTraceBatchStart"), "foo")
316318
}
317319

318320
traceBatchQueryCalledCount := 0
319321
tracer.traceBatchQuery = func(ctx context.Context, conn *pgx.Conn, data pgx.TraceBatchQueryData) {
320322
traceBatchQueryCalledCount++
321-
require.Equal(t, "foo", ctx.Value("fromTraceBatchStart"))
323+
require.Equal(t, "foo", ctx.Value(ctxKey("fromTraceBatchStart")))
322324
if traceBatchQueryCalledCount == 2 {
323325
require.Error(t, data.Err)
324326
} else {
@@ -329,7 +331,7 @@ func TestTraceBatchErrorWhileReadingResults(t *testing.T) {
329331
traceBatchEndCalled := false
330332
tracer.traceBatchEnd = func(ctx context.Context, conn *pgx.Conn, data pgx.TraceBatchEndData) {
331333
traceBatchEndCalled = true
332-
require.Equal(t, "foo", ctx.Value("fromTraceBatchStart"))
334+
require.Equal(t, "foo", ctx.Value(ctxKey("fromTraceBatchStart")))
333335
require.Error(t, data.Err)
334336
}
335337

@@ -381,13 +383,13 @@ func TestTraceBatchErrorWhileReadingResultsWhileClosing(t *testing.T) {
381383
traceBatchStartCalled = true
382384
require.NotNil(t, data.Batch)
383385
require.Equal(t, 3, data.Batch.Len())
384-
return context.WithValue(ctx, "fromTraceBatchStart", "foo")
386+
return context.WithValue(ctx, ctxKey("fromTraceBatchStart"), "foo")
385387
}
386388

387389
traceBatchQueryCalledCount := 0
388390
tracer.traceBatchQuery = func(ctx context.Context, conn *pgx.Conn, data pgx.TraceBatchQueryData) {
389391
traceBatchQueryCalledCount++
390-
require.Equal(t, "foo", ctx.Value("fromTraceBatchStart"))
392+
require.Equal(t, "foo", ctx.Value(ctxKey("fromTraceBatchStart")))
391393
if traceBatchQueryCalledCount == 2 {
392394
require.Error(t, data.Err)
393395
} else {
@@ -398,7 +400,7 @@ func TestTraceBatchErrorWhileReadingResultsWhileClosing(t *testing.T) {
398400
traceBatchEndCalled := false
399401
tracer.traceBatchEnd = func(ctx context.Context, conn *pgx.Conn, data pgx.TraceBatchEndData) {
400402
traceBatchEndCalled = true
401-
require.Equal(t, "foo", ctx.Value("fromTraceBatchStart"))
403+
require.Equal(t, "foo", ctx.Value(ctxKey("fromTraceBatchStart")))
402404
require.Error(t, data.Err)
403405
}
404406

@@ -440,13 +442,13 @@ func TestTraceCopyFrom(t *testing.T) {
440442
traceCopyFromStartCalled = true
441443
require.Equal(t, pgx.Identifier{"foo"}, data.TableName)
442444
require.Equal(t, []string{"a"}, data.ColumnNames)
443-
return context.WithValue(ctx, "fromTraceCopyFromStart", "foo")
445+
return context.WithValue(ctx, ctxKey("fromTraceCopyFromStart"), "foo")
444446
}
445447

446448
traceCopyFromEndCalled := false
447449
tracer.traceCopyFromEnd = func(ctx context.Context, conn *pgx.Conn, data pgx.TraceCopyFromEndData) {
448450
traceCopyFromEndCalled = true
449-
require.Equal(t, "foo", ctx.Value("fromTraceCopyFromStart"))
451+
require.Equal(t, "foo", ctx.Value(ctxKey("fromTraceCopyFromStart")))
450452
require.Equal(t, `COPY 2`, data.CommandTag.String())
451453
require.NoError(t, data.Err)
452454
}
@@ -488,7 +490,7 @@ func TestTracePrepare(t *testing.T) {
488490
tracePrepareStartCalled = true
489491
require.Equal(t, `ps`, data.Name)
490492
require.Equal(t, `select $1::text`, data.SQL)
491-
return context.WithValue(ctx, "fromTracePrepareStart", "foo")
493+
return context.WithValue(ctx, ctxKey("fromTracePrepareStart"), "foo")
492494
}
493495

494496
tracePrepareEndCalled := false
@@ -530,7 +532,7 @@ func TestTraceConnect(t *testing.T) {
530532
tracer.traceConnectStart = func(ctx context.Context, data pgx.TraceConnectStartData) context.Context {
531533
traceConnectStartCalled = true
532534
require.NotNil(t, data.ConnConfig)
533-
return context.WithValue(ctx, "fromTraceConnectStart", "foo")
535+
return context.WithValue(ctx, ctxKey("fromTraceConnectStart"), "foo")
534536
}
535537

536538
traceConnectEndCalled := false

‎tx.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,6 @@ type Tx interface {
152152
// called on the dbTx.
153153
type dbTx struct {
154154
conn *Conn
155-
err error
156155
savepointNum int64
157156
closed bool
158157
}

‎tx_test.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -555,6 +555,7 @@ func TestTxBeginFuncNestedTransactionCommit(t *testing.T) {
555555
require.NoError(t, err)
556556
return nil
557557
})
558+
require.NoError(t, err)
558559

559560
return nil
560561
})
@@ -601,6 +602,7 @@ func TestTxBeginFuncNestedTransactionRollback(t *testing.T) {
601602

602603
return nil
603604
})
605+
require.NoError(t, err)
604606

605607
var n int64
606608
err = db.QueryRow(context.Background(), "select count(*) from foo").Scan(&n)

0 commit comments

Comments
 (0)