Skip to content

Commit cd2a968

Browse files
jmdobryjmdobry
committed
Code updated for v2.
1 parent 4b2422a commit cd2a968

File tree

7 files changed

+55
-71
lines changed

7 files changed

+55
-71
lines changed

‎datastore/concepts.js‎

Lines changed: 49 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ function Entity(projectId) {
4747
if (keyFile) {
4848
options.keyFilename = keyFile;
4949
}
50-
this.datastore = gcloud.datastore(options);
50+
this.datastore = gcloud.datastore.dataset(options);
5151

5252
// To create the keys, we have to use this instance of Datastore.
5353
datastore.key = this.datastore.key;
@@ -210,27 +210,6 @@ Entity.prototype.testBasicEntity = function(callback) {
210210
}, callback);
211211
};
212212

213-
Entity.prototype.testUpsert = function(callback) {
214-
var taskKey = this.getIncompleteKey();
215-
var task = this.getTask();
216-
217-
// [START upsert]
218-
datastore.upsert({
219-
key: taskKey,
220-
data: task
221-
}, function(err) {
222-
if (!err) {
223-
// Task inserted successfully.
224-
}
225-
});
226-
// [END upsert]
227-
228-
this.datastore.upsert({
229-
key: taskKey,
230-
data: task
231-
}, callback);
232-
};
233-
234213
Entity.prototype.testInsert = function(callback) {
235214
var taskKey = this.getIncompleteKey();
236215
var task = this.getTask();
@@ -246,7 +225,8 @@ Entity.prototype.testInsert = function(callback) {
246225
});
247226
// [END insert]
248227

249-
this.datastore.insert({
228+
this.datastore.save({
229+
method: 'insert_auto_id',
250230
key: taskKey,
251231
data: task
252232
}, callback);
@@ -272,7 +252,8 @@ Entity.prototype.testLookup = function(callback) {
272252
});
273253
// [END lookup]
274254

275-
this.datastore.insert({
255+
this.datastore.save({
256+
method: 'insert_auto_id',
276257
key: taskKey,
277258
data: {}
278259
}, function(err) {
@@ -301,7 +282,8 @@ Entity.prototype.testUpdate = function(callback) {
301282
});
302283
// [END update]
303284

304-
this.datastore.insert({
285+
this.datastore.save({
286+
method: 'insert_auto_id',
305287
key: taskKey,
306288
data: {}
307289
}, function(err) {
@@ -329,7 +311,8 @@ Entity.prototype.testDelete = function(callback) {
329311
});
330312
// [END delete]
331313

332-
this.datastore.insert({
314+
this.datastore.save({
315+
method: 'insert_auto_id',
333316
key: taskKey,
334317
data: {}
335318
}, function(err) {
@@ -440,15 +423,15 @@ function Index(projectId) {
440423
if (keyFile) {
441424
options.keyFilename = keyFile;
442425
}
443-
this.datastore = gcloud.datastore(options);
426+
this.datastore = gcloud.datastore.dataset(options);
444427
}
445428

446429
Index.prototype.testUnindexedPropertyQuery = function(callback) {
447430
var datastore = this.datastore;
448431

449432
// [START unindexed_property_query]
450433
var query = datastore.createQuery('Task')
451-
.filter('description =', 'A task description.');
434+
.filter('description', '=', 'A task description.');
452435
// [END unindexed_property_query]
453436

454437
this.datastore.runQuery(query, callback);
@@ -459,6 +442,7 @@ Index.prototype.testExplodingProperties = function(callback) {
459442

460443
// [START exploding_properties]
461444
var task = {
445+
method: 'insert_auto_id',
462446
key: datastore.key('Task'),
463447
data: {
464448
tags: [
@@ -478,7 +462,7 @@ Index.prototype.testExplodingProperties = function(callback) {
478462

479463
delete datastore.key;
480464

481-
this.datastore.insert(task, callback);
465+
this.datastore.save(task, callback);
482466
};
483467

484468
function Metadata(projectId) {
@@ -489,7 +473,7 @@ function Metadata(projectId) {
489473
if (keyFile) {
490474
options.keyFilename = keyFile;
491475
}
492-
this.datastore = gcloud.datastore(options);
476+
this.datastore = gcloud.datastore.dataset(options);
493477
}
494478

495479
Metadata.prototype.testNamespaceRunQuery = function(callback) {
@@ -519,8 +503,8 @@ Metadata.prototype.testNamespaceRunQuery = function(callback) {
519503
// [START namespace_run_query]
520504
var query = datastore.createQuery('__namespace__')
521505
.select('__key__')
522-
.filter('__key__ >=', datastore.key(['__namespace__', startNamespace]))
523-
.filter('__key__ <', datastore.key(['__namespace__', endNamespace]));
506+
.filter('__key__', '>=', datastore.key(['__namespace__', startNamespace]))
507+
.filter('__key__', '<', datastore.key(['__namespace__', endNamespace]));
524508

525509
datastore.runQuery(query, function(err, entities) {
526510
if (err) {
@@ -627,7 +611,7 @@ function Query(projectId) {
627611
if (keyFile) {
628612
options.keyFilename = keyFile;
629613
}
630-
this.datastore = gcloud.datastore(options);
614+
this.datastore = gcloud.datastore.dataset(options);
631615

632616
this.basicQuery = this.getBasicQuery();
633617
this.projectionQuery = this.getProjectionQuery();
@@ -639,9 +623,11 @@ Query.prototype.getBasicQuery = function() {
639623

640624
// [START basic_query]
641625
var query = datastore.createQuery('Task')
642-
.filter('done =', false)
643-
.filter('priority >=', 4)
644-
.order('-priority');
626+
.filter('done', '=', false)
627+
.filter('priority', '>=', 4)
628+
.order('priority', {
629+
descending: true
630+
});
645631
// [END basic_query]
646632

647633
return query;
@@ -691,7 +677,7 @@ Query.prototype.testPropertyFilter = function(callback) {
691677

692678
// [START property_filter]
693679
var query = datastore.createQuery('Task')
694-
.filter('done =', false);
680+
.filter('done', '=', false);
695681
// [END property_filter]
696682

697683
this.datastore.runQuery(query, callback);
@@ -702,8 +688,8 @@ Query.prototype.testCompositeFilter = function(callback) {
702688

703689
// [START composite_filter]
704690
var query = datastore.createQuery('Task')
705-
.filter('done =', false)
706-
.filter('priority =', 4);
691+
.filter('done', '=', false)
692+
.filter('priority', '=', 4);
707693
// [END composite_filter]
708694

709695
this.datastore.runQuery(query, callback);
@@ -714,7 +700,7 @@ Query.prototype.testKeyFilter = function(callback) {
714700

715701
// [START key_filter]
716702
var query = datastore.createQuery('Task')
717-
.filter('__key__ >', datastore.key(['Task', 'someTask']));
703+
.filter('__key__', '>', datastore.key(['Task', 'someTask']));
718704
// [END key_filter]
719705

720706
this.datastore.runQuery(query, callback);
@@ -736,7 +722,9 @@ Query.prototype.testDescendingSort = function(callback) {
736722

737723
// [START descending_sort]
738724
var query = datastore.createQuery('Task')
739-
.order('-created');
725+
.order('created', {
726+
descending: true
727+
});
740728
// [END descending_sort]
741729

742730
this.datastore.runQuery(query, callback);
@@ -747,7 +735,9 @@ Query.prototype.testMultiSort = function(callback) {
747735

748736
// [START multi_sort]
749737
var query = datastore.createQuery('Task')
750-
.order('-priority')
738+
.order('priority', {
739+
descending: true
740+
})
751741
.order('created');
752742
// [END multi_sort]
753743

@@ -760,7 +750,7 @@ Query.prototype.testKindlessQuery = function(callback) {
760750

761751
// [START kindless_query]
762752
var query = datastore.createQuery()
763-
.filter('__key__ >', lastSeenKey);
753+
.filter('__key__', '>', lastSeenKey);
764754
// [END kindless_query]
765755

766756
this.datastore.runQuery(query, callback);
@@ -852,8 +842,8 @@ Query.prototype.testArrayValueInequalityRange = function(callback) {
852842

853843
// [START array_value_inequality_range]
854844
var query = datastore.createQuery('Task')
855-
.filter('tag >', 'learn')
856-
.filter('tag <', 'math');
845+
.filter('tag', '>', 'learn')
846+
.filter('tag', '<', 'math');
857847
// [END array_value_inequality_range]
858848

859849
this.datastore.runQuery(query, callback);
@@ -864,8 +854,8 @@ Query.prototype.testArrayValueEquality = function(callback) {
864854

865855
// [START array_value_equality]
866856
var query = datastore.createQuery('Task')
867-
.filter('tag =', 'fun')
868-
.filter('tag =', 'programming');
857+
.filter('tag', '=', 'fun')
858+
.filter('tag', '=', 'programming');
869859
// [END array_value_equality]
870860

871861
this.datastore.runQuery(query, callback);
@@ -876,8 +866,8 @@ Query.prototype.testInequalityRange = function(callback) {
876866

877867
// [START inequality_range]
878868
var query = datastore.createQuery('Task')
879-
.filter('created >', new Date('1990-01-01T00:00:00z'))
880-
.filter('created <', new Date('2000-12-31T23:59:59z'));
869+
.filter('created', '>', new Date('1990-01-01T00:00:00z'))
870+
.filter('created', '<', new Date('2000-12-31T23:59:59z'));
881871
// [END inequality_range]
882872

883873
this.datastore.runQuery(query, callback);
@@ -888,8 +878,8 @@ Query.prototype.testInequalityInvalid = function(callback) {
888878

889879
// [START inequality_invalid]
890880
var query = datastore.createQuery('Task')
891-
.filter('priority >', 3)
892-
.filter('created >', new Date('1990-01-01T00:00:00z'));
881+
.filter('priority', '>', 3)
882+
.filter('created', '>', new Date('1990-01-01T00:00:00z'));
893883
// [END inequality_invalid]
894884

895885
this.datastore.runQuery(query, callback);
@@ -900,10 +890,10 @@ Query.prototype.testEqualAndInequalityRange = function(callback) {
900890

901891
// [START equal_and_inequality_range]
902892
var query = datastore.createQuery('Task')
903-
.filter('priority =', 4)
904-
.filter('done =', false)
905-
.filter('created >', new Date('1990-01-01T00:00:00z'))
906-
.filter('created <', new Date('2000-12-31T23:59:59z'));
893+
.filter('priority', '=', 4)
894+
.filter('done', '=', false)
895+
.filter('created', '>', new Date('1990-01-01T00:00:00z'))
896+
.filter('created', '<', new Date('2000-12-31T23:59:59z'));
907897
// [END equal_and_inequality_range]
908898

909899
this.datastore.runQuery(query, callback);
@@ -914,7 +904,7 @@ Query.prototype.testInequalitySort = function(callback) {
914904

915905
// [START inequality_sort]
916906
var query = datastore.createQuery('Task')
917-
.filter('priority >', 3)
907+
.filter('priority', '>', 3)
918908
.order('priority')
919909
.order('created');
920910
// [END inequality_sort]
@@ -927,7 +917,7 @@ Query.prototype.testInequalitySortInvalidNotSame = function(callback) {
927917

928918
// [START inequality_sort_invalid_not_same]
929919
var query = datastore.createQuery('Task')
930-
.filter('priority >', 3)
920+
.filter('priority', '>', 3)
931921
.order('created');
932922
// [END inequality_sort_invalid_not_same]
933923

@@ -939,7 +929,7 @@ Query.prototype.testInequalitySortInvalidNotFirst = function(callback) {
939929

940930
// [START inequality_sort_invalid_not_first]
941931
var query = datastore.createQuery('Task')
942-
.filter('priority >', 3)
932+
.filter('priority', '>', 3)
943933
.order('created')
944934
.order('priority');
945935
// [END inequality_sort_invalid_not_first]
@@ -1056,7 +1046,7 @@ function Transaction(projectId) {
10561046
if (keyFile) {
10571047
options.keyFilename = keyFile;
10581048
}
1059-
this.datastore = gcloud.datastore(options);
1049+
this.datastore = gcloud.datastore.dataset(options);
10601050

10611051
this.fromKey = this.datastore.key(['Bank', 1, 'Account', 1]);
10621052
this.toKey = this.datastore.key(['Bank', 1, 'Account', 2]);

‎datastore/tasks.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ if (keyFile) {
3333
options.keyFilename = keyFile;
3434
}
3535

36-
var datastore = gcloud.datastore(options);
36+
var datastore = gcloud.datastore.dataset(options);
3737
// [END build_service]
3838

3939
/*

‎test/datastore/entity.test.js‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ var entity;
2020

2121
describe('datastore/concepts/entity', function () {
2222
before(function() {
23-
var projectId = process.env.TEST_PROJECT_ID || 'nodejs-docs-samples';
23+
var projectId = process.env.GCLOUD_PROJECT || 'nodejs-docs-samples';
2424
entity = new Entity(projectId);
2525
});
2626

@@ -79,12 +79,6 @@ describe('datastore/concepts/entity', function () {
7979
});
8080
});
8181

82-
describe('testUpsert', function() {
83-
it('saves with an upsert', function(done) {
84-
entity.testUpsert(done);
85-
});
86-
});
87-
8882
describe('testInsert', function() {
8983
it('saves with an insert', function(done) {
9084
entity.testInsert(done);

‎test/datastore/indexes.test.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ var index;
2020

2121
describe('datastore/concepts/indexes', function () {
2222
before(function() {
23-
var projectId = process.env.TEST_PROJECT_ID || 'nodejs-docs-samples';
23+
var projectId = process.env.GCLOUD_PROJECT || 'nodejs-docs-samples';
2424
index = new Index(projectId);
2525
});
2626

‎test/datastore/metadata.test.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ var metadata;
2020

2121
describe('datastore/concepts/metadata', function () {
2222
before(function() {
23-
var projectId = process.env.TEST_PROJECT_ID || 'nodejs-docs-samples';
23+
var projectId = process.env.GCLOUD_PROJECT || 'nodejs-docs-samples';
2424
metadata = new Metadata(projectId);
2525
});
2626

‎test/datastore/query.test.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ var entity;
2323

2424
describe('datastore/concepts/query', function () {
2525
before(function() {
26-
var projectId = process.env.TEST_PROJECT_ID || 'nodejs-docs-samples';
26+
var projectId = process.env.GCLOUD_PROJECT || 'nodejs-docs-samples';
2727
entity = new concepts.Entity(projectId);
2828
query = new concepts.Query(projectId);
2929
});

‎test/datastore/transaction.test.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ var transaction;
2020

2121
describe('datastore/concepts/transaction', function () {
2222
before(function() {
23-
var projectId = process.env.TEST_PROJECT_ID || 'nodejs-docs-samples';
23+
var projectId = process.env.GCLOUD_PROJECT || 'nodejs-docs-samples';
2424
transaction = new Transaction(projectId);
2525
});
2626

0 commit comments

Comments
 (0)