@@ -412,14 +412,14 @@ func TestWithTx(t *testing.T) {
412412 return err
413413 }
414414
415- return tx .Savepoint (
416- ctx ,
417- func (ctx context.Context , inner pg.Tx ) error {
418- _ , err := inner .Exec (ctx ,
419- "INSERT INTO test_tx_nested (name) VALUES ($1)" , "inner" )
420- return err
421- },
422- )
415+ return tx .Savepoint (
416+ ctx ,
417+ func (ctx context.Context , inner pg.Tx ) error {
418+ _ , err := inner .Exec (ctx ,
419+ "INSERT INTO test_tx_nested (name) VALUES ($1)" , "inner" )
420+ return err
421+ },
422+ )
423423 },
424424 )
425425 require .NoError (t , err )
@@ -452,16 +452,16 @@ func TestWithTx(t *testing.T) {
452452 return err
453453 }
454454
455- _ = tx .Savepoint (
456- ctx ,
457- func (ctx context.Context , inner pg.Tx ) error {
458- if _ , err := inner .Exec (ctx ,
459- "INSERT INTO test_tx_savepoint (name) VALUES ($1)" , "inner_fail" ); err != nil {
460- return err
461- }
462- return errors .New ("inner error" )
463- },
464- )
455+ _ = tx .Savepoint (
456+ ctx ,
457+ func (ctx context.Context , inner pg.Tx ) error {
458+ if _ , err := inner .Exec (ctx ,
459+ "INSERT INTO test_tx_savepoint (name) VALUES ($1)" , "inner_fail" ); err != nil {
460+ return err
461+ }
462+ return errors .New ("inner error" )
463+ },
464+ )
465465
466466 return nil
467467 },
@@ -502,25 +502,25 @@ func TestWithTx(t *testing.T) {
502502 err := client .WithTx (
503503 ctx ,
504504 func (ctx context.Context , tx pg.Tx ) error {
505- if err := tx .Savepoint (
506- ctx ,
507- func (ctx context.Context , inner pg.Tx ) error {
508- _ , err := inner .Exec (ctx ,
509- "INSERT INTO test_tx_multi_sp (name) VALUES ($1)" , "sp1" )
505+ if err := tx .Savepoint (
506+ ctx ,
507+ func (ctx context.Context , inner pg.Tx ) error {
508+ _ , err := inner .Exec (ctx ,
509+ "INSERT INTO test_tx_multi_sp (name) VALUES ($1)" , "sp1" )
510+ return err
511+ },
512+ ); err != nil {
510513 return err
511- },
512- ); err != nil {
513- return err
514- }
514+ }
515515
516- return tx .Savepoint (
517- ctx ,
518- func (ctx context.Context , inner pg.Tx ) error {
519- _ , err := inner .Exec (ctx ,
520- "INSERT INTO test_tx_multi_sp (name) VALUES ($1)" , "sp2" )
521- return err
522- },
523- )
516+ return tx .Savepoint (
517+ ctx ,
518+ func (ctx context.Context , inner pg.Tx ) error {
519+ _ , err := inner .Exec (ctx ,
520+ "INSERT INTO test_tx_multi_sp (name) VALUES ($1)" , "sp2" )
521+ return err
522+ },
523+ )
524524 },
525525 )
526526 require .NoError (t , err )
@@ -548,25 +548,25 @@ func TestWithTx(t *testing.T) {
548548 err := client .WithTx (
549549 ctx ,
550550 func (ctx context.Context , tx pg.Tx ) error {
551- if err := tx .Savepoint (ctx , func (ctx context.Context , inner pg.Tx ) error {
552- _ , err := inner .Exec (ctx ,
553- "INSERT INTO test_tx_sp_mixed (name) VALUES ($1)" , "kept" )
554- return err
555- }); err != nil {
556- return err
557- }
558-
559- _ = tx .Savepoint (
560- ctx ,
561- func (ctx context.Context , inner pg.Tx ) error {
551+ if err := tx .Savepoint (ctx , func (ctx context.Context , inner pg.Tx ) error {
562552 _ , err := inner .Exec (ctx ,
563- "INSERT INTO test_tx_sp_mixed (name) VALUES ($1)" , "discarded" )
564- if err != nil {
565- return err
566- }
567- return errors .New ("second savepoint fails" )
568- },
569- )
553+ "INSERT INTO test_tx_sp_mixed (name) VALUES ($1)" , "kept" )
554+ return err
555+ }); err != nil {
556+ return err
557+ }
558+
559+ _ = tx .Savepoint (
560+ ctx ,
561+ func (ctx context.Context , inner pg.Tx ) error {
562+ _ , err := inner .Exec (ctx ,
563+ "INSERT INTO test_tx_sp_mixed (name) VALUES ($1)" , "discarded" )
564+ if err != nil {
565+ return err
566+ }
567+ return errors .New ("second savepoint fails" )
568+ },
569+ )
570570
571571 return nil
572572 },
@@ -614,12 +614,12 @@ func TestWithTx(t *testing.T) {
614614 return err
615615 }
616616
617- return tx .Savepoint (
618- ctx ,
619- func (ctx context.Context , inner pg.Tx ) error {
620- return errors .New ("savepoint failed" )
621- },
622- )
617+ return tx .Savepoint (
618+ ctx ,
619+ func (ctx context.Context , inner pg.Tx ) error {
620+ return errors .New ("savepoint failed" )
621+ },
622+ )
623623 },
624624 )
625625 require .Error (t , err )
@@ -920,7 +920,7 @@ func TestWithTx_QuerierMethods(t *testing.T) {
920920 "INSERT INTO test_tx_batch (id, name) VALUES ($1, $2)" , 2 , "b" )
921921
922922 br := tx .SendBatch (ctx , batch )
923- for i := 0 ; i < 2 ; i ++ {
923+ for range 2 {
924924 if _ , err := br .Exec (); err != nil {
925925 return err
926926 }
@@ -1075,14 +1075,14 @@ func TestWithTx_Tracing(t *testing.T) {
10751075 if err != nil {
10761076 return err
10771077 }
1078- return tx .Savepoint (
1079- ctx ,
1080- func (ctx context.Context , inner pg.Tx ) error {
1081- _ , err := inner .Exec (ctx ,
1082- "INSERT INTO test_tx_trace_sp (name) VALUES ($1)" , "inner" )
1083- return err
1084- },
1085- )
1078+ return tx .Savepoint (
1079+ ctx ,
1080+ func (ctx context.Context , inner pg.Tx ) error {
1081+ _ , err := inner .Exec (ctx ,
1082+ "INSERT INTO test_tx_trace_sp (name) VALUES ($1)" , "inner" )
1083+ return err
1084+ },
1085+ )
10861086 },
10871087 )
10881088 require .NoError (t , err )
@@ -1109,12 +1109,12 @@ func TestWithTx_Tracing(t *testing.T) {
11091109 if err != nil {
11101110 return err
11111111 }
1112- _ = tx .Savepoint (
1113- ctx ,
1114- func (ctx context.Context , inner pg.Tx ) error {
1115- return errors .New ("inner savepoint error" )
1116- },
1117- )
1112+ _ = tx .Savepoint (
1113+ ctx ,
1114+ func (ctx context.Context , inner pg.Tx ) error {
1115+ return errors .New ("inner savepoint error" )
1116+ },
1117+ )
11181118 return nil
11191119 },
11201120 )
@@ -1258,7 +1258,7 @@ func TestSendBatch(t *testing.T) {
12581258 batch .Queue ("INSERT INTO test_batch (name) VALUES ($1)" , "b" )
12591259
12601260 br := conn .SendBatch (ctx , batch )
1261- for i := 0 ; i < 2 ; i ++ {
1261+ for range 2 {
12621262 if _ , err := br .Exec (); err != nil {
12631263 return err
12641264 }
0 commit comments