Merge pull request #341 from Meteor-Community-Packages/feature/create…

…Index Use createIndex
Meteor-Community-Packages · Aug 17, 2021 · c48a936 · c48a936
2 parents 707e99d + ece40d5
commit c48a936
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 12 deletions.
diff --git a/History.md b/History.md
@@ -1,3 +1,9 @@
+# Changelog
+
+## v3.4.0
+
+* Use the new `createIndex` instead of `_ensureIndex` if available
+
 ## v3.3.0
 
 * Update dependencies

diff --git a/package.js b/package.js
@@ -2,7 +2,7 @@
 
 Package.describe({
   summary: 'Authorization package for Meteor',
-  version: '3.3.0',
+  version: '3.4.0',
   git: 'https://github.com/Meteor-Community-Packages/meteor-roles.git',
   name: 'alanning:roles'
 })
@@ -45,7 +45,7 @@ Package.onTest(function (api) {
     'chai': '4.2.0'
   })
 
-  api.versionsFrom(['1.12', '2.3'])
+  api.versionsFrom('2.4')
 
   var both = ['client', 'server']
 

diff --git a/roles/roles_server.js b/roles/roles_server.js
@@ -1,12 +1,21 @@
 /* global Meteor, Roles */
-
-Meteor.roleAssignment._ensureIndex({ 'user._id': 1, 'inheritedRoles._id': 1, scope: 1 })
-Meteor.roleAssignment._ensureIndex({ 'user._id': 1, 'role._id': 1, scope: 1 })
-Meteor.roleAssignment._ensureIndex({ 'role._id': 1 })
-Meteor.roleAssignment._ensureIndex({ scope: 1, 'user._id': 1, 'inheritedRoles._id': 1 }) // Adding userId and roleId might speed up other queries depending on the first index
-Meteor.roleAssignment._ensureIndex({ 'inheritedRoles._id': 1 })
-
-Meteor.roles._ensureIndex({ 'children._id': 1 })
+if (Meteor.roles.createIndex) {
+  Meteor.roleAssignment.createIndex({ 'user._id': 1, 'inheritedRoles._id': 1, scope: 1 })
+  Meteor.roleAssignment.createIndex({ 'user._id': 1, 'role._id': 1, scope: 1 })
+  Meteor.roleAssignment.createIndex({ 'role._id': 1 })
+  Meteor.roleAssignment.createIndex({ scope: 1, 'user._id': 1, 'inheritedRoles._id': 1 }) // Adding userId and roleId might speed up other queries depending on the first index
+  Meteor.roleAssignment.createIndex({ 'inheritedRoles._id': 1 })
+
+  Meteor.roles.createIndex({ 'children._id': 1 })
+} else {
+  Meteor.roleAssignment._ensureIndex({ 'user._id': 1, 'inheritedRoles._id': 1, scope: 1 })
+  Meteor.roleAssignment._ensureIndex({ 'user._id': 1, 'role._id': 1, scope: 1 })
+  Meteor.roleAssignment._ensureIndex({ 'role._id': 1 })
+  Meteor.roleAssignment._ensureIndex({ scope: 1, 'user._id': 1, 'inheritedRoles._id': 1 }) // Adding userId and roleId might speed up other queries depending on the first index
+  Meteor.roleAssignment._ensureIndex({ 'inheritedRoles._id': 1 })
+
+  Meteor.roles._ensureIndex({ 'children._id': 1 })
+}
 
 /*
  * Publish logged-in user's roles so client-side checks can work.
@@ -356,8 +365,13 @@ Object.assign(Roles, {
   _backwardMigrate2: function (assignmentSelector) {
     assignmentSelector = assignmentSelector || {}
 
-    Meteor.users._ensureIndex({ 'roles._id': 1, 'roles.scope': 1 })
-    Meteor.users._ensureIndex({ 'roles.scope': 1 })
+    if (Meteor.users.createIndex) {
+      Meteor.users.createIndex({ 'roles._id': 1, 'roles.scope': 1 })
+      Meteor.users.createIndex({ 'roles.scope': 1 })
+    } else {
+      Meteor.users._ensureIndex({ 'roles._id': 1, 'roles.scope': 1 })
+      Meteor.users._ensureIndex({ 'roles.scope': 1 })
+    }
 
     Meteor.roleAssignment.find(assignmentSelector).forEach(r => {
       const roles = Meteor.users.findOne({ _id: r.user._id }).roles || []