Merge branch 'main' into databaserole_sessionlabels

Author: surbhigarg92

CHANGELOG.md

@@ -4,6 +4,18 @@
 
 [1]: https://www.npmjs.com/package/nodejs-spanner?activeTab=versions
 
+## [8.5.0](https://github.com/googleapis/nodejs-spanner/compare/v8.4.0...v8.5.0) (2026-01-22)
+
+
+### Features
+
+* Added OUTPUT_ONLY annotations to create_time and update_time in InternalRange to reflect existing service behavior ([#2505](https://github.com/googleapis/nodejs-spanner/issues/2505)) ([1058683](https://github.com/googleapis/nodejs-spanner/commit/105868339b1d2b7d7701a6b7591b85e3a1ca4098))
+
+
+### Bug Fixes
+
+* UUID type backward compatibility ([#2509](https://github.com/googleapis/nodejs-spanner/issues/2509)) ([7abb33c](https://github.com/googleapis/nodejs-spanner/commit/7abb33ca523b612f171def64c1ceb0cb7d162e82))
+
 ## [8.4.0](https://github.com/googleapis/nodejs-spanner/compare/v8.3.1...v8.4.0) (2026-01-09)
 
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@google-cloud/spanner",
   "description": "Cloud Spanner Client Library for Node.js",
-  "version": "8.4.0",
+  "version": "8.5.0",
   "license": "Apache-2.0",
   "author": "Google Inc.",
   "engines": {

samples/package.json

@@ -17,7 +17,7 @@
   "dependencies": {
     "@google-cloud/kms": "^5.0.0",
     "@google-cloud/precise-date": "^5.0.0",
-    "@google-cloud/spanner": "^8.4.0",
+    "@google-cloud/spanner": "^8.5.0",
     "protobufjs": "^7.0.0",
     "yargs": "^17.0.0"
   },

samples/system-test/spanner.test.js

@@ -1546,7 +1546,7 @@ describe('Autogenerated Admin Clients', () => {
     it('should restore database from a backup', async function () {
       // Restoring a backup can be a slow operation so the test may timeout and
       // we'll have to retry.
-      this.retries(5);
+      this.retries(3);
       // Delay the start of the test, if this is a retry.
       await delay(this.test, async () => {
         await cleanupDatabase(INSTANCE_ID, RESTORE_DATABASE_ID);
@@ -1569,7 +1569,7 @@ describe('Autogenerated Admin Clients', () => {
     it('should restore database from a backup using an encryption key', async function () {
       // Restoring a backup can be a slow operation so the test may timeout and
       // we'll have to retry.
-      this.retries(5);
+      this.retries(3);
       // Delay the start of the test, if this is a retry.
       await delay(this.test, async () => {
         await cleanupDatabase(INSTANCE_ID, ENCRYPTED_RESTORE_DATABASE_ID);
@@ -2433,7 +2433,8 @@ describe('Autogenerated Admin Clients', () => {
     });
   });
 
-  describe('encrypted database and backups with multiple KMS keys', () => {
+  // Skipping KMS test suite as tests are getting timed out frequently.
+  describe.skip('encrypted database and backups with multiple KMS keys', () => {
     const MR_CMEK_DB = `test-mr-${CURRENT_TIME}-db`;
     const MR_CMEK_BACKUP = `test-mr-${CURRENT_TIME}-backup`;
     const MR_CMEK_COPIED = `test-mr-${CURRENT_TIME}-copied`;

src/codec.ts

@@ -38,6 +38,8 @@ import * as uuid from 'uuid';
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export type Value = any;
 
+let uuidUntypedFlagWarned = false;
+
 export interface Field {
   name: string;
   value: Value;
@@ -1160,8 +1162,17 @@ function getType(value: Value): Type {
     return {type: 'bool'};
   }
 
-  if (uuid.validate(value)) {
-    return {type: 'unspecified'};
+  if (process.env['SPANNER_ENABLE_UUID_AS_UNTYPED'] === 'true') {
+    if (!uuidUntypedFlagWarned) {
+      process.emitWarning(
+        'SPANNER_ENABLE_UUID_AS_UNTYPED environment variable is deprecated and will be removed in a future release.',
+        'DeprecationWarning',
+      );
+      uuidUntypedFlagWarned = true;
+    }
+    if (uuid.validate(value)) {
+      return {type: 'unspecified'};
+    }
   }
 
   if (isString(value)) {

src/transaction.ts

@@ -1735,14 +1735,18 @@ export class Snapshot extends EventEmitter {
     if (!isEmpty(typeMap)) {
       Object.keys(typeMap).forEach(param => {
         const type = typeMap[param];
-        const typeObject = codec.createTypeObject(type);
-        if (
-          (type.child &&
-            typeObject.code === 'ARRAY' &&
-            typeObject.arrayElementType?.code !== 'TYPE_CODE_UNSPECIFIED') ||
-          (!type.child && typeObject.code !== 'TYPE_CODE_UNSPECIFIED')
-        ) {
-          paramTypes[param] = typeObject;
+        if (process.env['SPANNER_ENABLE_UUID_AS_UNTYPED'] === 'true') {
+          const typeObject = codec.createTypeObject(type);
+          if (
+            (type.child &&
+              typeObject.code === 'ARRAY' &&
+              typeObject.arrayElementType?.code !== 'TYPE_CODE_UNSPECIFIED') ||
+            (!type.child && typeObject.code !== 'TYPE_CODE_UNSPECIFIED')
+          ) {
+            paramTypes[param] = typeObject;
+          }
+        } else {
+          paramTypes[param] = codec.createTypeObject(type);
         }
       });
     }

test/codec.ts

@@ -1778,12 +1778,41 @@ describe('codec', () => {
       });
     });
 
-    it('should determine if the uuid value is unspecified', () => {
+    it('should determine if the uuid value is string', () => {
       assert.deepStrictEqual(codec.getType(uuid.v4()), {
-        type: 'unspecified',
+        type: 'string',
       });
     });
 
+    it('should determine if the uuid value is unspecified when SPANNER_ENABLE_UUID_AS_UNTYPED is true', () => {
+      const emitWarningStub = sandbox.stub(process, 'emitWarning');
+      try {
+        process.env['SPANNER_ENABLE_UUID_AS_UNTYPED'] = 'true';
+        assert.deepStrictEqual(codec.getType(uuid.v4()), {
+          type: 'unspecified',
+        });
+        assert.strictEqual(emitWarningStub.calledOnce, true);
+        assert.strictEqual(
+          emitWarningStub.firstCall.args[0],
+          'SPANNER_ENABLE_UUID_AS_UNTYPED environment variable is deprecated and will be removed in a future release.',
+        );
+      } finally {
+        delete process.env['SPANNER_ENABLE_UUID_AS_UNTYPED'];
+        emitWarningStub.restore();
+      }
+    });
+
+    it('should determine if the uuid value is string when SPANNER_ENABLE_UUID_AS_UNTYPED is false', () => {
+      try {
+        process.env['SPANNER_ENABLE_UUID_AS_UNTYPED'] = 'false';
+        assert.deepStrictEqual(codec.getType(uuid.v4()), {
+          type: 'string',
+        });
+      } finally {
+        delete process.env['SPANNER_ENABLE_UUID_AS_UNTYPED'];
+      }
+    });
+
     it('should determine if the value is a float32', () => {
       assert.deepStrictEqual(codec.getType(new codec.Float32(1.1)), {
         type: 'float32',