datastore: pass Buffers instead of base64s

stephenplusplus · stephenplusplus · commit 1be2ae387d53 · 2016-10-06T15:19:47.000-04:00
diff --git a/packages/datastore/src/entity.js b/packages/datastore/src/entity.js
@@ -268,7 +268,7 @@ function encodeValue(value) {
   }
 
   if (value instanceof Buffer) {
-    valueProto.blobValue = value.toString('base64');
+    valueProto.blobValue = value;
     return valueProto;
   }
 
@@ -622,11 +622,7 @@ function queryToQueryProto(query) {
   };
 
   if (query.endVal) {
-    if (is.string(query.endVal)) {
-      queryProto.endCursor = query.endVal;
-    } else {
-      queryProto.endCursor = query.endVal.toString('base64');
-    }
+    queryProto.endCursor = query.endVal;
   }
 
   if (query.limitVal > 0) {
@@ -640,11 +636,7 @@ function queryToQueryProto(query) {
   }
 
   if (query.startVal) {
-    if (is.string(query.startVal)) {
-      queryProto.startCursor = query.startVal;
-    } else {
-      queryProto.startCursor = query.startVal.toString('base64');
-    }
+    queryProto.startCursor = query.startVal;
   }
 
   if (query.filters.length > 0) {
diff --git a/packages/datastore/test/entity.js b/packages/datastore/test/entity.js
@@ -357,7 +357,7 @@ describe('entity', function() {
       var value = new Buffer('Hi');
 
       var expectedValueProto = {
-        blobValue: value.toString('base64')
+        blobValue: value
       };
 
       assert.deepEqual(entity.encodeValue(value), expectedValueProto);
@@ -881,8 +881,8 @@ describe('entity', function() {
         .end(endVal);
 
       var queryProto = entity.queryToQueryProto(query);
-      assert.strictEqual(queryProto.endCursor, endVal.toString('base64'));
-      assert.strictEqual(queryProto.startCursor, startVal.toString('base64'));
+      assert.strictEqual(queryProto.endCursor, endVal);
+      assert.strictEqual(queryProto.startCursor, startVal);
     });
   });
 });

Original file line number	Diff line number	Diff line change
`@@ -268,7 +268,7 @@ function encodeValue(value) {`
`268`	`268`	`}`
`269`	`269`
`270`	`270`	`if (value instanceof Buffer) {`
`271`		`- valueProto.blobValue = value.toString('base64');`
	`271`	`+ valueProto.blobValue = value;`
`272`	`272`	`return valueProto;`
`273`	`273`	`}`
`274`	`274`
`@@ -622,11 +622,7 @@ function queryToQueryProto(query) {`
`622`	`622`	`};`
`623`	`623`
`624`	`624`	`if (query.endVal) {`
`625`		`- if (is.string(query.endVal)) {`
`626`		`- queryProto.endCursor = query.endVal;`
`627`		`- } else {`
`628`		`- queryProto.endCursor = query.endVal.toString('base64');`
`629`		`- }`
	`625`	`+ queryProto.endCursor = query.endVal;`
`630`	`626`	`}`
`631`	`627`
`632`	`628`	`if (query.limitVal > 0) {`
`@@ -640,11 +636,7 @@ function queryToQueryProto(query) {`
`640`	`636`	`}`
`641`	`637`
`642`	`638`	`if (query.startVal) {`
`643`		`- if (is.string(query.startVal)) {`
`644`		`- queryProto.startCursor = query.startVal;`
`645`		`- } else {`
`646`		`- queryProto.startCursor = query.startVal.toString('base64');`
`647`		`- }`
	`639`	`+ queryProto.startCursor = query.startVal;`
`648`	`640`	`}`
`649`	`641`
`650`	`642`	`if (query.filters.length > 0) {`