Merge branch '2.1.1'

chumager · Jul 9, 2019 · a94dcd7 · a94dcd7
2 parents b0ecf76 + 473742f
commit a94dcd7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/index.js b/index.js
@@ -58,7 +58,7 @@ module.exports = function(schema, options) {
                 const parentDoc = isSubdocument ? this.ownerDocument() : this;
                 const isNew = typeof parentDoc.isNew === "boolean" ? parentDoc.isNew : !isQuery;
 
-                const conditions = indexOptions.partialFilterExpression || {};
+                let conditions = {};
                 each(paths, name => {
                   let pathValue;
 
@@ -113,6 +113,7 @@ module.exports = function(schema, options) {
                 if (model.baseModelName && indexOptions.partialFilterExpression === null) {
                   model = model.db.model(model.baseModelName);
                 }
+                conditions = {$and: [conditions, indexOptions.partialFilterExpression || {}]};
 
                 model.find(conditions).countDocuments((err, count) => {
                   resolve(count === 0);

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mongoose-unique-validator",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "mongoose-unique-validator is a plugin which adds pre-save validation for unique fields within a Mongoose schema.",
   "main": "index.js",
   "scripts": {