fix: Revert untyped param type feature (#2012)

This fix is reverting the feature untyped param type added in [PR](https://togithub.com/googleapis/nodejs-spanner/pull/1869) and released in [7.4.0](https://togithub.com/googleapis/nodejs-spanner/releases/tag/v7.4.0) This fixes issue #2009 which was introduced by untyped param type feature.
googleapis · Mar 4, 2024 · 49fa60d · 49fa60d
1 parent e3abd5f
commit 49fa60d
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 420 deletions.
diff --git a/samples/dml.js b/samples/dml.js
@@ -288,21 +288,6 @@ function updateUsingDmlWithStruct(instanceId, databaseId, projectId) {
         params: {
           name: nameStruct,
         },
-        types: {
-          name: {
-            type: 'struct',
-            fields: [
-              {
-                name: 'FirstName',
-                type: 'string',
-              },
-              {
-                name: 'LastName',
-                type: 'string',
-              },
-            ],
-          },
-        },
       });
 
       console.log(`Successfully updated ${rowCount} record.`);

diff --git a/samples/struct.js b/samples/struct.js
@@ -111,21 +111,6 @@ async function queryDataWithStruct(instanceId, databaseId, projectId) {
     params: {
       name: nameStruct,
     },
-    types: {
-      name: {
-        type: 'struct',
-        fields: [
-          {
-            name: 'FirstName',
-            type: 'string',
-          },
-          {
-            name: 'LastName',
-            type: 'string',
-          },
-        ],
-      },
-    },
   };
 
   // Queries rows from the Singers table
@@ -265,21 +250,6 @@ async function queryStructField(instanceId, databaseId, projectId) {
     params: {
       name: nameStruct,
     },
-    types: {
-      name: {
-        type: 'struct',
-        fields: [
-          {
-            name: 'FirstName',
-            type: 'string',
-          },
-          {
-            name: 'LastName',
-            type: 'string',
-          },
-        ],
-      },
-    },
   };
 
   // Queries rows from the Singers table

diff --git a/src/codec.ts b/src/codec.ts
@@ -629,6 +629,10 @@ function getType(value: Value): Type {
     return {type: 'bool'};
   }
 
+  if (is.string(value)) {
+    return {type: 'string'};
+  }
+
   if (Buffer.isBuffer(value)) {
     return {type: 'bytes'};
   }
@@ -671,7 +675,6 @@ function getType(value: Value): Type {
     return {type: 'json'};
   }
 
-  // String type is also returned as unspecified to allow untyped parameters
   return {type: 'unspecified'};
 }
 

diff --git a/src/transaction.ts b/src/transaction.ts
@@ -1300,10 +1300,7 @@ export class Snapshot extends EventEmitter {
     if (!is.empty(typeMap)) {
       Object.keys(typeMap).forEach(param => {
         const type = typeMap[param];
-        const typeObject = codec.createTypeObject(type);
-        if (typeObject.code !== 'TYPE_CODE_UNSPECIFIED') {
-          paramTypes[param] = codec.createTypeObject(type);
-        }
+        paramTypes[param] = codec.createTypeObject(type);
       });
     }