datastore: Avoid empty string if no namespace is set. Fixes #11.

googleapis · Jul 9, 2014 · 2b07ac8 · 2b07ac8
1 parent c50be23
commit 2b07ac8
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/lib/datastore/entity.js b/lib/datastore/entity.js
@@ -77,7 +77,7 @@ var keyToKeyProto = function(datasetId, key) {
   if (key.length < 2) {
     throw new Error("A key should contain at least a kind and an idenfier.")
   }
-  var namespace = '', start = 0;
+  var namespace = null, start = 0;
   if (key.length % 2 == 1) {
     // the first item is the namepsace
     namespace = key[0];
@@ -93,10 +93,14 @@ var keyToKeyProto = function(datasetId, key) {
     }
     path.push(p);
   }
-  return {
-    partitionId: { datasetId: datasetId, namespace: namespace },
+  var proto = {
+    partitionId: { datasetId: datasetId },
     path: path
   };
+  if (namespace) {
+    proto.partitionId.namespace = namespace;
+  }
+  return proto;
 };
 
 module.exports.keyToKeyProto = keyToKeyProto;

diff --git a/test/datastore.entity.js b/test/datastore.entity.js
@@ -88,7 +88,7 @@ describe('keyToKeyProto', function() {
     var key = ['Kind1', 1, 'Kind2', 'name'];
     var proto = entity.keyToKeyProto('datasetId', key);
     assert.strictEqual(proto.partitionId.datasetId, 'datasetId');
-    assert.strictEqual(proto.partitionId.namespace, '');
+    assert.strictEqual(proto.partitionId.namespace, undefined);
     assert.strictEqual(proto.path[0].kind, 'Kind1');
     assert.strictEqual(proto.path[0].id, 1);
     assert.strictEqual(proto.path[0].name, undefined);
@@ -120,7 +120,7 @@ describe('keyToKeyProto', function() {
     var protoWithNS = entity.keyToKeyProto('datasetId', keyWithNS);
 
     assert.strictEqual(proto.partitionId.datasetId, 'datasetId');
-    assert.strictEqual(proto.partitionId.namespace, '');
+    assert.strictEqual(proto.partitionId.namespace, undefined);
     assert.strictEqual(proto.path[0].kind, 'Kind1');
     assert.strictEqual(proto.path[0].id, undefined);
     assert.strictEqual(proto.path[0].name, undefined);

diff --git a/test/datastore.js b/test/datastore.js
@@ -179,7 +179,6 @@ describe('Dataset', function() {
       assert.deepEqual(proto.keys[0], {
         partitionId:{
           datasetId: 's~test',
-          namespace: ''
         },
         path :[{kind:'Kind'}]
       });