Changes for Datastore v1beta3.

GoogleCloudPlatform · Mar 1, 2016 · 91badac · 91badac
1 parent d72e429
commit 91badac
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 6 deletions.
diff --git a/datastore/concepts.js b/datastore/concepts.js
@@ -47,7 +47,7 @@ function Entity(projectId) {
   if (keyFile) {
     options.keyFilename = keyFile;
   }
-  this.datastore = gcloud.datastore.dataset(options);
+  this.datastore = gcloud.datastore(options);
 
   // To create the keys, we have to use this instance of Datastore.
   datastore.key = this.datastore.key;
@@ -231,6 +231,27 @@ Entity.prototype.testUpsert = function(callback) {
   }, callback);
 };
 
+Entity.prototype.testUpsert = function(callback) {
+  var taskKey = this.getIncompleteKey();
+  var task = this.getTask();
+
+  // [START upsert]
+  datastore.upsert({
+    key: taskKey,
+    data: task
+  }, function(err) {
+    if (!err) {
+      // Task inserted successfully.
+    }
+  });
+  // [END upsert]
+
+  this.datastore.upsert({
+    key: taskKey,
+    data: task
+  }, callback);
+};
+
 Entity.prototype.testInsert = function(callback) {
   var taskKey = this.getIncompleteKey();
   var task = this.getTask();
@@ -444,7 +465,7 @@ function Index(projectId) {
   if (keyFile) {
     options.keyFilename = keyFile;
   }
-  this.datastore = gcloud.datastore.dataset(options);
+  this.datastore = gcloud.datastore(options);
 }
 
 Index.prototype.testUnindexedPropertyQuery = function(callback) {
@@ -494,7 +515,7 @@ function Metadata(projectId) {
   if (keyFile) {
     options.keyFilename = keyFile;
   }
-  this.datastore = gcloud.datastore.dataset(options);
+  this.datastore = gcloud.datastore(options);
 }
 
 Metadata.prototype.testNamespaceRunQuery = function(callback) {
@@ -632,7 +653,7 @@ function Query(projectId) {
   if (keyFile) {
     options.keyFilename = keyFile;
   }
-  this.datastore = gcloud.datastore.dataset(options);
+  this.datastore = gcloud.datastore(options);
 
   this.basicQuery = this.getBasicQuery();
   this.projectionQuery = this.getProjectionQuery();
@@ -1067,7 +1088,7 @@ function Transaction(projectId) {
   if (keyFile) {
     options.keyFilename = keyFile;
   }
-  this.datastore = gcloud.datastore.dataset(options);
+  this.datastore = gcloud.datastore(options);
 
   this.fromKey = this.datastore.key(['Bank', 1, 'Account', 1]);
   this.toKey = this.datastore.key(['Bank', 1, 'Account', 2]);

diff --git a/datastore/package.json b/datastore/package.json
@@ -14,6 +14,6 @@
   },
   "dependencies": {
     "async": "^1.5.2",
-    "gcloud": "^0.28.0"
+    "gcloud": "stephenplusplus/gcloud-node#spp--datastore-v1beta3"
   }
 }
diff --git a/test/datastore/entity.test.js b/test/datastore/entity.test.js
@@ -85,6 +85,12 @@ describe('datastore/concepts/entity', function () {
     });
   });
 
+  describe('testUpsert', function() {
+    it('saves with an upsert', function(done) {
+      entity.testUpsert(done);
+    });
+  });
+
   describe('testInsert', function() {
     it('saves with an insert', function(done) {
       entity.testInsert(done);