don't apply optimistic concurrency if optCon array

Automattic · Jun 13, 2023 · 97dec73 · 97dec73
1 parent 40528ce
commit 97dec73
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/model.js b/lib/model.js
@@ -356,7 +356,7 @@ Model.prototype.$__handleSave = function(options, callback) {
     const optionsWithCustomValues = Object.assign({}, options, saveOptions);
     const where = this.$__where();
     const optimisticConcurrency = this.$__schema.options.optimisticConcurrency;
-    if (optimisticConcurrency) {
+    if (optimisticConcurrency && !Array.isArray(optimisticConcurrency)) {
       const key = this.$__schema.options.versionKey;
       const val = this.$__getValue(key);
       if (val != null) {

diff --git a/test/versioning.test.js b/test/versioning.test.js
@@ -512,7 +512,7 @@ describe('versioning', function() {
     assert.equal(err.name, 'VersionError');
   });
 
-  it('should support optimisticConcurrency being an array of strings asdf', async function() {
+  it('should support optimisticConcurrency being an array of strings', async function() {
     const thingSchema = new Schema({ price: Number, name: String }, { optimisticConcurrency: ['price', 'name'] });
     const Thing = db.model('Thing', thingSchema);
 
@@ -526,7 +526,7 @@ describe('versioning', function() {
     assert.equal(thing_1.__v, 1);
     thing_2.set({ price: 1, name: 'Test' });
     const err = await thing_2.save().then(() => null, err => err);
-    assert.equal(err.name, 'VersionError');
+    assert.ok(!err)
   });
 
   it('gh-1898', async function() {