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

return un-mongo-converted insertedId

Browse Source 
… instead of converting to mongo form and back
This commit is contained in:
David Greenspan
2013-09-30 15:41:47 -07:00
parent ea63ea560f
commit e1dd2b40f8
1 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
packages/mongo-livedata/mongo_driver.js
View File

@@ -340,7 +340,7 @@ MongoConnection.prototype._update = function (collection_name, selector, mod,
var mongoMod = replaceTypes(mod, replaceMeteorAtomWithMongo);
var isModify = isModificationMod(mongoMod);
var knownId = (isModify ? mongoSelector._id : mongoMod._id);
var knownId = (isModify ? selector._id : mod._id);
if (options.upsert && (! knownId) && options.insertedId) {
mongoOpts.insertedId = options.insertedId;
@@ -367,10 +367,7 @@ MongoConnection.prototype._update = function (collection_name, selector, mod,
if (result && ! options.returnObject)
result = result.numberAffected;
}
callback(err, replaceTypes(
result,
replaceMongoAtomWithMeteor
));
callback(err, result);
}));
}
} catch (e) {
@@ -429,10 +426,7 @@ var simulateUpsertWithInsertedId = function (collection, selector, mod,
if (err) {
callback(err);
} else if (result.numberAffected) {
callback(null, replaceTypes(
result,
replaceMongoAtomWithMeteor
));
callback(null, result);
} else {
doConditionalInsert();
}
@@ -479,9 +473,9 @@ var simulateUpsertWithInsertedId = function (collection, selector, mod,
callback(err);
}
} else {
callback(null, replaceTypes(_.extend(result, {
callback(null, _.extend(result, {
insertedId: insertedId
}), replaceMongoAtomWithMeteor));
}));
}
}));
};