fix: presubmit error

googleapis · Apr 15, 2024 · b84750a · b84750a
1 parent fcabb63
commit b84750a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/samples/insert-query-with-get-trasanction.js b/samples/insert-query-with-get-trasanction.js
@@ -19,7 +19,8 @@
 async function main(instanceId, databaseId, projectId) {
   // [START spanner_insert_query_with_get_transaction]
   // Imports the Google Cloud client library.
-  const {Spanner} = require('@google-cloud/spanner');
+  const {Spanner, protos} = require('@google-cloud/spanner');
+  const Priority = protos.google.spanner.v1.RequestOptions.Priority;
 
   /**
    * TODO(developer): Uncomment the following lines before running the sample.
@@ -40,7 +41,10 @@ async function main(instanceId, databaseId, projectId) {
 
     const options = {
       optimisticLock: true,
-    };
+      requestOptions: {
+        priority: Priority.PRIORITY_LOW,
+      },
+    }
 
     const promise = await database.getTransaction(options);
     const transaction = promise[0];

diff --git a/src/database.ts b/src/database.ts
@@ -2014,10 +2014,12 @@ class Database extends common.GrpcServiceObject {
         ? (optionsOrCallback as GetTransactionOptions)
         : {};
     this.pool_.getSession((err, session, transaction) => {
-      transaction!.requestOptions = Object.assign(
-        transaction!.requestOptions || {},
-        options.requestOptions
-      );
+      if(options.requestOptions) {
+        transaction!.requestOptions = Object.assign(
+          transaction!.requestOptions || {},
+          options.requestOptions
+        );
+      }
       if (options.optimisticLock) {
         transaction!.useOptimisticLock();
       }