throw if uneven number of columns

stephenplusplus · stephenplusplus · commit 810465f853be · 2017-06-30T20:09:06.000-04:00
diff --git a/packages/spanner/src/transaction-request.js b/packages/spanner/src/transaction-request.js
@@ -686,7 +686,18 @@ TransactionRequest.prototype.mutate_ = function(method, table, keyVals, cb) {
 
   var columns = uniq(flatten(keyVals.map(Object.keys))).sort();
 
-  var values = keyVals.map(function(keyVal) {
+  var values = keyVals.map(function(keyVal, index) {
+    var keys = Object.keys(keyVal);
+
+    var missingColumns = columns.filter(column => keys.indexOf(column) === -1);
+
+    if (missingColumns.length > 0) {
+      throw new Error([
+        `Row at index ${index} does not contain the correct number of columns.`,
+        `Missing columns: ${JSON.stringify(missingColumns)}`
+      ].join('\n\n'));
+    }
+
     return columns.map(function(column) {
       var value = keyVal[column];
       return codec.encode(value);
diff --git a/packages/spanner/test/transaction-request.js b/packages/spanner/test/transaction-request.js
@@ -872,6 +872,31 @@ describe('TransactionRequest', function() {
       assert.strictEqual(returnValue, requestReturnValue);
     });
 
+    it('should throw when rows have incorrect amount of columns', function() {
+      var invalidEntry = { key1: 'val' };
+      var caughtError;
+
+      try {
+        transactionRequest.mutate_(METHOD, TABLE, [
+          invalidEntry,
+          { key1: 'val', key2: 'val' }
+        ], assert.ifError);
+      } catch(e) {
+        caughtError = e;
+      } finally {
+        if (!caughtError) {
+          throw new Error('Expected error was not thrown.');
+        }
+
+        var expectedErrorMessage = [
+          'Row at index 0 does not contain the correct number of columns.',
+          'Missing columns: ["key2"]'
+        ].join('\n\n');
+
+        assert.strictEqual(caughtError.message, expectedErrorMessage);
+      }
+    });
+
     it('should push the request to the queue if a transaction', function(done) {
       transactionRequest.transaction = true;
 
