made requested changes

IslandRhythms · IslandRhythms · commit f11bb07ca4e7 · 2022-01-06T15:12:36.000-05:00
diff --git a/lib/model.js b/lib/model.js
@@ -833,6 +833,10 @@ Model.prototype.$__version = function(where, delta) {
     return;
   }
 
+  if(key === false) {
+    return;
+  }
+
   // updates
 
   // only apply versioning if our versionKey was selected. else
diff --git a/test/model.test.js b/test/model.test.js
@@ -7563,68 +7563,31 @@ describe('Model', function() {
 
     });
     it('Using bulkSave should not trigger an error (gh-11071)', async function() {
-
-      class TestModel {
-        static _instance
-        _model;
-    
-        /**
-         * @private
-         */
-        constructor() {}
-    
-        static create() {
-            if (this._instance) {return this._instance;}
-            this._instance = new this();
-    
-            let pairSchema = mongoose.Schema({
-                name: String,
-                timestamp: String
-            }, { versionKey: false });
-    
-            this._instance._model = db.model('test', pairSchema);
-    
-            return this._instance;
-        }
     
-        async insertTests() {
-    
-            const tests = [
-                {name: 't1', timestamp: Date.now()},
-                {name: 't2', timestamp: Date.now()},
-                {name: 't3', timestamp: Date.now()},
-                {name: 't4', timestamp: Date.now()},
-            ];
-    
-            try {
-                return this._model.insertMany(tests, {
-                    ordered: false
-                });
-            }
-            catch (err) {
-                throw new Error(`${this.constructor.name} insertMany: ${err}`);
-            }
-        }
+      const pairSchema = mongoose.Schema({
+          name: String,
+          timestamp: String
+      }, { versionKey: false });
     
-        async all() {
-            return await this._model.find({});
-        }
-    
-        async bulkSaveTest(tests) {
-            for (let p of tests) {
-                p.timestamp = Date.now();
-            }
-    
-            // !!! "TypeError: path.indexOf is not a function" occurs here
-            let res = await this._model.bulkSave(tests);
-            return res;
-        }
-    
-    }
-      const testModel = TestModel.create();
-      await testModel.insertTests();
-      let tests = await testModel.all();
-      assert.ok(await testModel.bulkSaveTest(tests));
+      const model = db.model('test', pairSchema);
+      const tests = [
+        { name: 't1', timestamp: Date.now() },
+        { name: 't2', timestamp: Date.now() },
+        { name: 't3', timestamp: Date.now() },
+        { name: 't4', timestamp: Date.now() },
+      ];
+
+      model.insertMany(tests, {
+          ordered: false
+      });
+      const entries = await model.find({});
+      for (const p of entries) {
+        p.timestamp = Date.now();
+      }
+
+      // !!! "TypeError: path.indexOf is not a function" occurs here
+      const res = await model.bulkSave(entries);
+      assert.ok(res);
     });
   });
 

Original file line number	Diff line number	Diff line change
`@@ -833,6 +833,10 @@ Model.prototype.$__version = function(where, delta) {`
`833`	`833`	`return;`
`834`	`834`	`}`
`835`	`835`
	`836`	`+ if(key === false) {`
	`837`	`+ return;`
	`838`	`+ }`
	`839`	`+`
`836`	`840`	`// updates`
`837`	`841`
`838`	`842`	`// only apply versioning if our versionKey was selected. else`