Skip to content
This repository was archived by the owner on Mar 4, 2026. It is now read-only.

Commit cc614e3

Browse files
committed
addressed review feedback
1 parent f9f6239 commit cc614e3

5 files changed

Lines changed: 9 additions & 5 deletions

File tree

src/database.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -266,8 +266,6 @@ export interface GetIamPolicyOptions {
266266

267267
/**
268268
* @typedef {object} GetTransactionOptions
269-
* * @property {boolean} [readLockMode] The read lock mode a
270-
* {@link Transaction} should use while running.
271269
*/
272270
export type GetTransactionOptions = Omit<RunTransactionOptions, 'timeout'>;
273271

src/table.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1122,6 +1122,7 @@ class Table {
11221122
requestOptions: requestOptions,
11231123
excludeTxnFromChangeStreams: excludeTxnFromChangeStreams,
11241124
isolationLevel: isolationLevel,
1125+
readLockMode: readLockMode,
11251126
},
11261127
(err, transaction) => {
11271128
if (err) {

src/transaction-runner.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,10 @@ const RetryInfo = Root.fromJSON(jsonProtos).lookup('google.rpc.RetryInfo');
4646
export interface RunTransactionOptions {
4747
timeout?: number;
4848
requestOptions?: Pick<IRequestOptions, 'transactionTag'>;
49+
/**
50+
* @deprecated Use readLockMode instead.
51+
*/
52+
optimisticLock?: boolean;
4953
excludeTxnFromChangeStreams?: boolean;
5054
isolationLevel?: IsolationLevel;
5155
readLockMode?: ReadLockMode;

system-test/spanner.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ import {google} from '../protos/protos';
4949
import CreateDatabaseMetadata = google.spanner.admin.database.v1.CreateDatabaseMetadata;
5050
import CreateBackupMetadata = google.spanner.admin.database.v1.CreateBackupMetadata;
5151
import CreateInstanceConfigMetadata = google.spanner.admin.instance.v1.CreateInstanceConfigMetadata;
52+
import ReadLockMode = google.spanner.v1.TransactionOptions.ReadWrite.ReadLockMode;
5253
const singer = require('../test/data/singer');
5354
const music = singer.examples.spanner.music;
5455
import {util} from 'protobufjs';
@@ -9152,7 +9153,7 @@ describe('Spanner', () => {
91529153

91539154
it('GOOGLE_STANDARD_SQL should use getTransaction for executing sql', async () => {
91549155
const transaction = (
9155-
await DATABASE.getTransaction({optimisticLock: true})
9156+
await DATABASE.getTransaction({readLockMode: ReadLockMode.OPTIMISTIC})
91569157
)[0];
91579158

91589159
try {

test/database.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3535,9 +3535,9 @@ describe('Database', () => {
35353535
readLockMode: ReadLockMode.PESSIMISTIC,
35363536
};
35373537

3538-
await database.runTransaction(fakeOptions, assert.ifError);
3538+
await database.runTransactionAsync(fakeOptions, assert.ifError);
35393539

3540-
const options = fakeTransactionRunner.calledWith_[3];
3540+
const options = fakeAsyncTransactionRunner.calledWith_[3];
35413541
assert.strictEqual(options, fakeOptions);
35423542
});
35433543

0 commit comments

Comments
 (0)