Merge pull request #10063 from Automattic/gh-10044

collation not added to text indexes
Automattic · Mar 31, 2021 · 966770f · 966770f
2 parents f24953c + 9e4a083
commit 966770f
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 3 deletions.
diff --git a/lib/model.js b/lib/model.js
@@ -1575,7 +1575,6 @@ function _ensureIndexes(model, options, callback) {
   let indexError;
 
   options = options || {};
-
   const done = function(err) {
     if (err && !model.$caught) {
       model.emit('error', err);
@@ -1634,8 +1633,13 @@ function _ensureIndexes(model, options, callback) {
 
     const indexFields = utils.clone(index[0]);
     const indexOptions = utils.clone(index[1]);
+    let isTextIndex = false;
+    for (const key of Object.keys(indexFields)) {
+      if (indexFields[key] === 'text') {
+        isTextIndex = true;
+      }
+    }
     delete indexOptions._autoIndex;
-
     _decorateDiscriminatorIndexOptions(model, indexOptions);
     if ('safe' in options) {
       _handleSafe(options);
@@ -1654,7 +1658,8 @@ function _ensureIndexes(model, options, callback) {
       indexOptions.background = options.background;
     }
     if (model.schema.options.hasOwnProperty('collation') &&
-        !indexOptions.hasOwnProperty('collation')) {
+        !indexOptions.hasOwnProperty('collation') &&
+        !isTextIndex) {
       indexOptions.collation = model.schema.options.collation;
     }
 

diff --git a/test/model.indexes.test.js b/test/model.indexes.test.js
@@ -666,5 +666,22 @@ describe('model', function() {
         ]);
       });
     });
+    it('should prevent collation on text indexes (gh-10044)', function() {
+      return co(function*() {
+        const userSchema = new mongoose.Schema({ username: String }, {
+          collation: {
+            locale: 'en',
+            strength: 2
+          }
+        });
+        userSchema.index({ username: 'text' }, { unique: true });
+        const User = db.model('User', userSchema, 'User');
+
+        yield User.init();
+        const indexes = yield User.listIndexes();
+        assert.ok(!indexes[1].collation);
+        yield User.collection.drop();
+      });
+    });
   });
 });