# HG changeset patch # User Tom Gottfried # Date 1557142399 -7200 # Node ID 1de0764f6af4d55d5be0ed42f565088eeafbe5ff # Parent d9903cb3484286083a7401e182e76013f0a35c3e Use context for preparation of transaction-specific statements diff -r d9903cb34842 -r 1de0764f6af4 pkg/imports/bn.go --- a/pkg/imports/bn.go Mon May 06 13:25:49 2019 +0200 +++ b/pkg/imports/bn.go Mon May 06 13:33:19 2019 +0200 @@ -257,7 +257,8 @@ defer tx.Rollback() var found bool - err = tx.Stmt(hasStmt).QueryRowContext(ctx, bn.Bottleneck_id).Scan(&found) + err = tx.StmtContext(ctx, hasStmt).QueryRowContext(ctx, + bn.Bottleneck_id).Scan(&found) switch { case err == sql.ErrNoRows: // This is good. @@ -283,7 +284,7 @@ var nid int64 - err = tx.Stmt(insertStmt).QueryRowContext( + err = tx.StmtContext(ctx, insertStmt).QueryRowContext( ctx, bn.Bottleneck_id, bn.Fk_g_fid, @@ -309,7 +310,8 @@ for _, material := range bn.Riverbed.Material { if material != nil { mat := string(*material) - if _, err := tx.Stmt(insertMaterialStmt).ExecContext( + if _, err := tx.StmtContext(ctx, + insertMaterialStmt).ExecContext( ctx, nid, material); err != nil { feedback.Warn( "Failed to insert riverbed material '%s' for bottleneck '%s'.", @@ -320,7 +322,7 @@ } } - if _, err := tx.Stmt(trackStmt).ExecContext( + if _, err := tx.StmtContext(ctx, trackStmt).ExecContext( ctx, importID, "waterway.bottlenecks", nid, ); err != nil { return err