From 1964d2e88ec52b53561cd7d9ccc82651a42b2336 Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Thu, 26 Sep 2013 14:48:13 -0700
Subject: [PATCH] Support  in minimongo

---
 packages/minimongo/minimongo.js | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/packages/minimongo/minimongo.js b/packages/minimongo/minimongo.js
index 86fe4df943..c1f2a21771 100644
--- a/packages/minimongo/minimongo.js
+++ b/packages/minimongo/minimongo.js
@@ -549,12 +549,19 @@ LocalCollection.prototype.remove = function (selector, callback) {
 // we rollback the whole operation, or what?
 LocalCollection.prototype.update = function (selector, mod, options, callback) {
   var self = this;
+  var newMod = _.clone(mod);
   if (! callback && options instanceof Function) {
     callback = options;
     options = null;
   }
   if (!options) options = {};
 
+  var setOnInsert;
+  if (newMod.$setOnInsert) {
+    setOnInsert = _.clone(newMod.$setOnInsert);
+    delete newMod.$setOnInsert;
+  }
+
   var selector_f = LocalCollection._compileSelector(selector);
 
   // Save the original results of any query that we might need to
@@ -576,7 +583,7 @@ LocalCollection.prototype.update = function (selector, mod, options, callback) {
     if (selector_f(doc)) {
       // XXX Should we save the original even if mod ends up being a no-op?
       self._saveOriginal(id, doc);
-      self._modifyAndNotify(doc, mod, recomputeQids);
+      self._modifyAndNotify(doc, newMod, recomputeQids);
       ++updateCount;
       if (!options.multi)
         break;
@@ -591,10 +598,18 @@ LocalCollection.prototype.update = function (selector, mod, options, callback) {
   });
   self._observeQueue.drain();
 
+  if (setOnInsert)
+    newMod.$setOnInsert = setOnInsert;
+
   var insertedId;
   if (updateCount === 0 && options.upsert) {
     var newDoc = _.clone(selector);
-    LocalCollection._modify(newDoc, mod);
+    if (newMod.$setOnInsert) {
+      newMod.$set = _.extend(newMod.$set || {},
+                          _.clone(newMod.$setOnInsert));
+      delete newMod.$setOnInsert;
+    }
+    LocalCollection._modify(newDoc, newMod);
     insertedId = self.insert(newDoc);
     updateCount = 1;
   }