Fix enableCollationCaseComparison, caseInsensitive and test

parse-community · Nov 12, 2023 · c8b6129 · c8b6129
1 parent 7bff03c
commit c8b6129
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 15 deletions.
diff --git a/spec/DatabaseController.spec.js b/spec/DatabaseController.spec.js
@@ -515,7 +515,7 @@ describe('DatabaseController', function () {
     it('should not find a case insensitive user by email with convertEmailToLowercase', async () => {
       await reconfigureServer({ convertEmailToLowercase: true });
       const user = new Parse.User();
-      await user.save({ email: '[email protected]', password: 'password' });
+      await user.save({ username: 'EXAMPLE', email: '[email protected]', password: 'password' });
 
       const query = new Parse.Query(Parse.User);
       query.equalTo('email', '[email protected]');

diff --git a/src/Controllers/DatabaseController.js b/src/Controllers/DatabaseController.js
@@ -1235,7 +1235,7 @@ class DatabaseController {
             keys,
             readPreference,
             hint,
-            caseInsensitive,
+            caseInsensitive: this.options.enableCollationCaseComparison ? false : caseInsensitive,
             explain,
           };
           Object.keys(sort).forEach(fieldName => {
@@ -1739,25 +1739,27 @@ class DatabaseController {
       throw error;
     });
 
-    await this.adapter
-      .ensureIndex('_User', requiredUserFields, ['username'], 'case_insensitive_username', true)
-      .catch(error => {
-        logger.warn('Unable to create case insensitive username index: ', error);
-        throw error;
-      });
+    if (!this.options.enableCollationCaseComparison) {
+      await this.adapter
+        .ensureIndex('_User', requiredUserFields, ['username'], 'case_insensitive_username', true)
+        .catch(error => {
+          logger.warn('Unable to create case insensitive username index: ', error);
+          throw error;
+        });
+
+      await this.adapter
+        .ensureIndex('_User', requiredUserFields, ['email'], 'case_insensitive_email', true)
+        .catch(error => {
+          logger.warn('Unable to create case insensitive email index: ', error);
+          throw error;
+        });
+    }
 
     await this.adapter.ensureUniqueness('_User', requiredUserFields, ['email']).catch(error => {
       logger.warn('Unable to ensure uniqueness for user email addresses: ', error);
       throw error;
     });
 
-    await this.adapter
-      .ensureIndex('_User', requiredUserFields, ['email'], 'case_insensitive_email', true)
-      .catch(error => {
-        logger.warn('Unable to create case insensitive email index: ', error);
-        throw error;
-      });
-
     await this.adapter.ensureUniqueness('_Role', requiredRoleFields, ['name']).catch(error => {
       logger.warn('Unable to ensure uniqueness for role name: ', error);
       throw error;