fix(document): update single nested subdoc parent when setting to exi…

…sting single nested doc Fix #8400
Automattic · Dec 12, 2019 · bbabfee · bbabfee
1 parent 2c2f98b
commit bbabfee
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/lib/schema/SingleNestedPath.js b/lib/schema/SingleNestedPath.js
@@ -157,7 +157,7 @@ SingleNestedPath.prototype.$conditionalHandlers.$exists = $exists;
  */
 
 SingleNestedPath.prototype.cast = function(val, doc, init, priorVal) {
-  if (val && val.$isSingleNested) {
+  if (val && val.$isSingleNested && val.parent === doc) {
     return val;
   }
 

diff --git a/test/document.test.js b/test/document.test.js
@@ -2571,7 +2571,7 @@ describe('document', function() {
       velvetRevolver.guitarist = gnr.guitarist;
       velvetRevolver.save(function(error) {
         assert.ifError(error);
-        assert.equal(velvetRevolver.guitarist, gnr.guitarist);
+        assert.equal(velvetRevolver.guitarist.name, 'Slash');
         done();
       });
     });
@@ -8282,4 +8282,23 @@ describe('document', function() {
       }, /Cannot call.*multiple times/);
     });
   });
+
+  it('setting a path to a single nested document should update the single nested doc parent (gh-8400)', function() {
+    const schema = Schema({
+      name: String,
+      subdoc: new Schema({
+        name: String
+      })
+    });
+    const Model = db.model('gh8400', schema);
+
+    const doc1 = new Model({ name: 'doc1', subdoc: { name: 'subdoc1' } });
+    const doc2 = new Model({ name: 'doc2', subdoc: { name: 'subdoc2' } });
+
+    doc1.subdoc = doc2.subdoc;
+    assert.equal(doc1.subdoc.name, 'subdoc2');
+    assert.equal(doc2.subdoc.name, 'subdoc2');
+    assert.strictEqual(doc1.subdoc.ownerDocument(), doc1);
+    assert.strictEqual(doc2.subdoc.ownerDocument(), doc2);
+  });
 });