From e1dd2b40f84ed9a8a88edda628e628f0cdcac7f2 Mon Sep 17 00:00:00 2001
From: David Greenspan <dgreenspan@alum.mit.edu>
Date: Mon, 30 Sep 2013 15:41:47 -0700
Subject: [PATCH] return un-mongo-converted insertedId
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

… instead of converting to mongo form and back
---
 packages/mongo-livedata/mongo_driver.js | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/packages/mongo-livedata/mongo_driver.js b/packages/mongo-livedata/mongo_driver.js
index 3af2b41b5a..c7acecb048 100644
--- a/packages/mongo-livedata/mongo_driver.js
+++ b/packages/mongo-livedata/mongo_driver.js
@@ -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));
+                          }));
                         }
                       }));
   };