github/meteor
1
1
Fork 0
mirror of https://github.com/meteor/meteor.git synced 2026-05-02 03:01:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove callback and transform mongodb insert in async

Browse Source
This commit is contained in:
Edimar Cardoso
2022-12-21 11:14:27 -03:00
parent 9b7c649a0c
commit d74505a86c
2 changed files with 37 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
packages/mongo/mongo_driver.js
View File

@@ -480,13 +480,6 @@ MongoConnection.prototype._update = async function (collection_name, selector, m
if (!mod || typeof mod !== 'object') {
const error = new Error("Invalid modifier. Modifier must be an object.");
if (callback) {
return callback(error);
} else {
throw error;
}
}
throw error;
}
@@ -587,34 +580,35 @@ MongoConnection.prototype._update = async function (collection_name, selector, m
const strings = Object.keys(mongoMod).filter((key) => !key.startsWith("$"));
let updateMethod = strings.length > 0 ? 'replaceOne' : 'updateMany';
updateMethod =
updateMethod === 'updateMany' && !mongoOpts.multi
? 'updateOne'
: updateMethod;
return collection[updateMethod].bind(collection)(
mongoSelector, mongoMod, mongoOpts).then(result => {
var meteorResult = transformResult({result});
if (meteorResult && options._returnObject) {
// If this was an upsert() call, and we ended up
// inserting a new doc and we know its id, then
// return that id as well.
if (options.upsert && meteorResult.insertedId) {
if (knownId) {
meteorResult.insertedId = knownId;
} else if (meteorResult.insertedId instanceof MongoDB.ObjectID) {
meteorResult.insertedId = new Mongo.ObjectID(meteorResult.insertedId.toHexString());
updateMethod === 'updateMany' && !mongoOpts.multi
? 'updateOne'
: updateMethod;
return collection[updateMethod]
.bind(collection)(mongoSelector, mongoMod, mongoOpts)
.then(result => {
var meteorResult = transformResult({result});
if (meteorResult && options._returnObject) {
// If this was an upsert() call, and we ended up
// inserting a new doc and we know its id, then
// return that id as well.
if (options.upsert && meteorResult.insertedId) {
if (knownId) {
meteorResult.insertedId = knownId;
} else if (meteorResult.insertedId instanceof MongoDB.ObjectID) {
meteorResult.insertedId = new Mongo.ObjectID(meteorResult.insertedId.toHexString());
}
}
refresh();
write.committed();
return meteorResult;
} else {
refresh();
write.committed();
return meteorResult.numberAffected;
}
}
refresh();
write.committed();
return meteorResult;
} else {
refresh();
write.committed();
return meteorResult.numberAffected;
}
}).catch(err => {
throw err;
});
}).catch(err => {
throw err;
});
}
};

19
packages/mongo/mongo_livedata_tests.js
View File

@@ -1341,7 +1341,7 @@ _.each( ['STRING'], function(idGeneration) {
await Meteor.callAsync('createInsecureCollection', this.collectionName);
Meteor.subscribe('c-' + this.collectionName, expect());
}
}, async function (test) {
}, async function (test, expect) {
const coll = new Mongo.Collection(this.collectionName, collectionOptions);
const id = await runAndThrowIfNeeded(() => coll.insert({}), test);
@@ -1360,7 +1360,7 @@ _.each( ['STRING'], function(idGeneration) {
await Meteor.callAsync('createInsecureCollection', this.collectionName);
Meteor.subscribe('c-' + this.collectionName, expect());
}
}, async function () {
}, async function (test, expect) {
const coll = new Mongo.Collection(this.collectionName, collectionOptions);
// No callback! Before fixing #2413, this method never returned and
@@ -1381,7 +1381,7 @@ _.each( ['STRING'], function(idGeneration) {
await Meteor.callAsync('createInsecureCollection', this.collectionName);
Meteor.subscribe('c-' + this.collectionName, expect());
}
}, async function (test) {
}, async function (test, expect) {
const coll = new Mongo.Collection(this.collectionName, collectionOptions);
const testWidget = {
name: 'Widget name'
@@ -1404,7 +1404,7 @@ _.each( ['STRING'], function(idGeneration) {
await Meteor.callAsync('createInsecureCollection', this.collectionName, collectionOptions);
Meteor.subscribe('c-' + this.collectionName, expect());
}
}, async function (test) {
}, async function (test, expect) {
const self = this;
const coll = self.coll = new Mongo.Collection(self.collectionName, collectionOptions);
@@ -1462,18 +1462,16 @@ _.each( ['STRING'], function(idGeneration) {
await Meteor.callAsync('createInsecureCollection', this.collectionName, collectionOptions);
Meteor.subscribe('c-' + this.collectionName, expect());
}
}, async function (test, expect) {
}, /*async function (test, expect) {
var self = this;
self.coll = new Mongo.Collection(self.collectionName, self.collectionOptions);
var obs;
var expectAdd = expect(function (doc) {
var expectAdd = function (doc) {
test.equal(doc.seconds(), 50);
});
};
var expectRemove = async function (doc) {
test.equal(doc.seconds(), 50);
console.log({doc});
await obs.stop();
expect();
};
const id = await runAndThrowIfNeeded(() => self.coll.insert({d: new Date(1356152390004)}), test, false);
test.isTrue(id);
@@ -1490,7 +1488,8 @@ _.each( ['STRING'], function(idGeneration) {
transform: function (doc) {return {seconds: doc.d.getSeconds()};}
})).seconds, 50);
await self.coll.remove(id);
},
expect();
},*/
async function (test) {
var self = this;
self.id1 = await runAndThrowIfNeeded(() => self.coll.insert({d: new Date(1356152390004)}), test, false);