fix(model): use schema-level default collation for indexes if index d…

…oesn't have collation Fix #9912
Automattic · Feb 13, 2021 · 6c78829 · 6c78829 · aqemi · Mar 14, 2021
1 parent 003e4a8
commit 6c78829
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/lib/model.js b/lib/model.js
@@ -1650,6 +1650,10 @@ function _ensureIndexes(model, options, callback) {
     if ('background' in options) {
       indexOptions.background = options.background;
     }
+    if (model.schema.options.hasOwnProperty('collation') &&
+        !indexOptions.hasOwnProperty('collation')) {
+      indexOptions.collation = model.schema.options.collation;
+    }
 
     const methodName = useCreateIndex ? 'createIndex' : 'ensureIndex';
     model.collection[methodName](indexFields, indexOptions, utils.tick(function(err, name) {

diff --git a/test/model.indexes.test.js b/test/model.indexes.test.js
@@ -569,7 +569,6 @@ describe('model', function() {
         let indexes = yield User.listIndexes();
         assert.equal(indexes.length, 2);
         assert.deepEqual(indexes[1].key, { username: 1 });
-        console.log(indexes);
         assert.ok(indexes[1].collation);
         assert.equal(indexes[1].collation.strength, 2);