diff options
| author | Jonathan Amsterdam <jba@google.com> | 2020-04-15 16:57:51 -0400 |
|---|---|---|
| committer | Jonathan Amsterdam <jba@google.com> | 2020-04-16 14:10:02 +0000 |
| commit | 7d2a6cfadd9231e0ab26e8e05ce1431837c49dac (patch) | |
| tree | 722eb8e44c646e3958639f95864b2300ba7d01b8 /internal/database/database_test.go | |
| parent | f3d7078125541e8902382be09e4a770414d90a59 (diff) | |
| download | go-x-pkgsite-7d2a6cfadd9231e0ab26e8e05ce1431837c49dac.tar.xz | |
internal/database: log transaction start and end
This requires adding a context parameter to the Transact method.
Change-Id: I98e8b9cbd8ce724cbed693d7549e82cf8ee75990
Reviewed-on: https://team-review.git.corp.google.com/c/golang/discovery/+/719480
Reviewed-by: Julie Qiu <julieqiu@google.com>
Diffstat (limited to 'internal/database/database_test.go')
| -rw-r--r-- | internal/database/database_test.go | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/internal/database/database_test.go b/internal/database/database_test.go index 01e12288..84f56977 100644 --- a/internal/database/database_test.go +++ b/internal/database/database_test.go @@ -128,7 +128,7 @@ func TestBulkInsert(t *testing.T) { } }() - if err := testDB.Transact(func(db *DB) error { + if err := testDB.Transact(ctx, func(db *DB) error { return db.BulkInsert(ctx, table, tc.columns, tc.values, tc.conflictAction) }); tc.wantErr && err == nil || !tc.wantErr && err != nil { t.Errorf("testDB.Transact: %v | wantErr = %t", err, tc.wantErr) @@ -161,7 +161,7 @@ func TestLargeBulkInsert(t *testing.T) { for i := 0; i < size; i++ { vals[i] = i + 1 } - if err := testDB.Transact(func(db *DB) error { + if err := testDB.Transact(ctx, func(db *DB) error { return db.BulkInsert(ctx, "test_large_bulk", []string{"i"}, vals, "") }); err != nil { t.Fatal(err) @@ -186,8 +186,9 @@ func TestLargeBulkInsert(t *testing.T) { } func TestDBAfterTransactFails(t *testing.T) { + ctx := context.Background() var tx *DB - err := testDB.Transact(func(d *DB) error { + err := testDB.Transact(ctx, func(d *DB) error { tx = d return nil }) @@ -195,7 +196,7 @@ func TestDBAfterTransactFails(t *testing.T) { t.Fatal(err) } var i int - err = tx.QueryRow(context.Background(), `SELECT 1`).Scan(&i) + err = tx.QueryRow(ctx, `SELECT 1`).Scan(&i) if err == nil { t.Fatal("got nil, want error") } @@ -236,7 +237,7 @@ func TestBulkUpdate(t *testing.T) { for i := 0; i < 50; i++ { values = append(values, i, i) } - err := testDB.Transact(func(tx *DB) error { + err := testDB.Transact(ctx, func(tx *DB) error { return tx.BulkInsert(ctx, "bulk_update", cols, values, "") }) if err != nil { @@ -250,7 +251,7 @@ func TestBulkUpdate(t *testing.T) { updateVals[1] = append(updateVals[1], -i) } - err = testDB.Transact(func(tx *DB) error { + err = testDB.Transact(ctx, func(tx *DB) error { return tx.BulkUpdate(ctx, "bulk_update", cols, []string{"INT", "INT"}, updateVals) }) if err != nil { |
