Merge pull request Automattic#2607 from LearnBoost/Automatticgh-2322

Support indexes for schemas that are embedded multiple times
weo-edu · Jan 21, 2015 · ea22e0e · ea22e0e
2 parents 5046e86 + af431ba
commit ea22e0e
Show file tree

Hide file tree

Showing 2 changed files with 60 additions and 9 deletions.
diff --git a/lib/schema.js b/lib/schema.js
@@ -729,17 +729,16 @@ Object.defineProperty(Schema, 'indexTypes', {
 Schema.prototype.indexes = function () {
   'use strict';
 
-  var indexes = []
-    , seenSchemas = []
-  collectIndexes(this);
-  return indexes;
+  var indexes = [];
+  var seenPrefix = {};
 
-  function collectIndexes (schema, prefix) {
-    if (~seenSchemas.indexOf(schema)) return;
-    seenSchemas.push(schema);
+  var collectIndexes = function(schema, prefix) {
+    if (seenPrefix[prefix]) {
+      return;
+    }
+    seenPrefix[prefix] = true;
 
     prefix = prefix || '';
-
     var key, path, index, field, isObject, options, type;
     var keys = Object.keys(schema.paths);
 
@@ -784,7 +783,11 @@ Schema.prototype.indexes = function () {
       });
       indexes = indexes.concat(schema._indexes);
     }
-  }
+
+  };
+
+  collectIndexes(this);
+  return indexes;
 
   /*!
    * Checks for indexes added to subdocs using Schema.index().

diff --git a/test/model.indexes.test.js b/test/model.indexes.test.js
@@ -97,6 +97,54 @@ describe('model', function(){
       });
     });
 
+    it('of multiple embedded documents with same schema', function(done) {
+      var BlogPosts = new Schema({
+        _id: { type: ObjectId, index: true },
+        title: { type: String, index: true },
+        desc: String
+      });
+
+      var User = new Schema({
+        name: { type: String, index: true },
+        blogposts: [BlogPosts],
+        featured: [BlogPosts]
+      });
+
+      var db = start();
+      var UserModel = db.model('DeepIndexedModel', User, 'gh-2322');
+      var assertions = 0;
+
+      UserModel.on('index', function () {
+        UserModel.collection.getIndexes(function (err, indexes) {
+          assert.ifError(err);
+
+          for (var i in indexes) {
+            indexes[i].forEach(function(index){
+              if (index[0] === 'name') {
+                ++assertions;
+              }
+              if (index[0] === 'blogposts._id') {
+                ++assertions;
+              }
+              if (index[0] === 'blogposts.title') {
+                ++assertions;
+              }
+              if (index[0] === 'featured._id') {
+                ++assertions;
+              }
+              if (index[0] === 'featured.title') {
+                ++assertions;
+              }
+            });
+          }
+
+          db.close();
+          assert.equal(5, assertions);
+          done();
+        });
+      });
+    });
+
     it('compound: on embedded docs', function(done){
       var BlogPosts = new Schema({
           title   : String