Remove CLI flag, use databaseVersion & engine

Author: NotBobTheBuilder

spec/DatabaseController.spec.js

@@ -1,7 +1,62 @@
 const DatabaseController = require('../lib/Controllers/DatabaseController.js');
+const isVersionAffectedByServer13732 =
+  DatabaseController._isVersionAffectedByServer13732;
 const validateQuery = DatabaseController._validateQuery;
 
 describe('DatabaseController', function() {
+  describe('isVersionAffectedByServer13732', function() {
+    it('should only return true for affected versions of mongodb', function() {
+      for (let patch = 0; patch <= 12; patch++) {
+        expect(
+          isVersionAffectedByServer13732('MongoDB', '2.6.' + patch)
+        ).toEqual(true);
+        expect(
+          isVersionAffectedByServer13732('PostgreSQL', '2.6.' + patch)
+        ).toEqual(false);
+      }
+      for (let patch = 0; patch <= 15; patch++) {
+        expect(
+          isVersionAffectedByServer13732('MongoDB', '3.0.' + patch)
+        ).toEqual(true);
+        expect(
+          isVersionAffectedByServer13732('PostgreSQL', '3.0.' + patch)
+        ).toEqual(false);
+      }
+      for (let patch = 0; patch <= 22; patch++) {
+        expect(
+          isVersionAffectedByServer13732('MongoDB', '3.2.' + patch)
+        ).toEqual(true);
+        expect(
+          isVersionAffectedByServer13732('PostgreSQL', '3.2.' + patch)
+        ).toEqual(false);
+      }
+      for (let patch = 0; patch <= 21; patch++) {
+        expect(
+          isVersionAffectedByServer13732('MongoDB', '3.4.' + patch)
+        ).toEqual(true);
+        expect(
+          isVersionAffectedByServer13732('PostgreSQL', '3.4.' + patch)
+        ).toEqual(false);
+      }
+      for (let patch = 0; patch <= 13; patch++) {
+        expect(
+          isVersionAffectedByServer13732('MongoDB', '3.6.' + patch)
+        ).toEqual(false);
+        expect(
+          isVersionAffectedByServer13732('PostgreSQL', '3.6.' + patch)
+        ).toEqual(false);
+      }
+      for (let patch = 0; patch <= 10; patch++) {
+        expect(
+          isVersionAffectedByServer13732('MongoDB', '4.0.' + patch)
+        ).toEqual(false);
+        expect(
+          isVersionAffectedByServer13732('PostgreSQL', '4.0.' + patch)
+        ).toEqual(false);
+      }
+    });
+  });
+
   describe('validateQuery', function() {
     describe('with skipMongoDBServer13732Workaround disabled (the default)', function() {
       it('should restructure simple cases of SERVER-13732', done => {

src/Config.js

@@ -34,8 +34,7 @@ export class Config {
         );
         config.database = new DatabaseController(
           cacheInfo.databaseController.adapter,
-          schemaCache,
-          cacheInfo.skipMongoDBServer13732Workaround
+          schemaCache
         );
       } else {
         config[key] = cacheInfo[key];

src/Controllers/DatabaseController.js

@@ -406,24 +406,26 @@ const relationSchema = {
   fields: { relatedId: { type: 'String' }, owningId: { type: 'String' } },
 };
 
+const isVersionAffectedByServer13732 = (engine, version) =>
+  engine == 'MongoDB' && /^(2\.6|3\.0|3\.2|3\.4)/.test(version);
+
 class DatabaseController {
   adapter: StorageAdapter;
   schemaCache: any;
   schemaPromise: ?Promise<SchemaController.SchemaController>;
   skipMongoDBServer13732Workaround: boolean;
 
-  constructor(
-    adapter: StorageAdapter,
-    schemaCache: any,
-    skipMongoDBServer13732Workaround: boolean
-  ) {
+  constructor(adapter: StorageAdapter, schemaCache: any) {
     this.adapter = adapter;
     this.schemaCache = schemaCache;
     // We don't want a mutable this.schema, because then you could have
     // one request that uses different schemas for different parts of
     // it. Instead, use loadSchema to get a schema.
     this.schemaPromise = null;
-    this.skipMongoDBServer13732Workaround = skipMongoDBServer13732Workaround;
+    this.skipMongoDBServer13732Workaround = !isVersionAffectedByServer13732(
+      adapter.engine,
+      adapter.databaseVersion
+    );
   }
 
   collectionExists(className: string): Promise<boolean> {
@@ -1605,9 +1607,11 @@ class DatabaseController {
     ]);
   }
 
+  static _isVersionAffectedByServer13732: (string, string) => boolean;
   static _validateQuery: (any, boolean) => void;
 }
 
 module.exports = DatabaseController;
-// Expose validateQuery for tests
+// Expose validateQuery & isVersionAffectedByServer13732 for tests
+module.exports._isVersionAffectedByServer13732 = isVersionAffectedByServer13732;
 module.exports._validateQuery = validateQuery;

src/Controllers/SchemaController.js

@@ -228,7 +228,9 @@ function validateCLP(perms: ClassLevelPermissions, fields: SchemaFields) {
         // @flow-disable-next
         throw new Parse.Error(
           Parse.Error.INVALID_JSON,
-          `'${perms[operation]}' is not a valid value for class level permissions ${operation}`
+          `'${
+            perms[operation]
+          }' is not a valid value for class level permissions ${operation}`
         );
       } else {
         perms[operation].forEach(key => {

src/Controllers/index.js

@@ -147,7 +147,6 @@ export function getDatabaseController(
   const {
     databaseURI,
     databaseOptions,
-    skipMongoDBServer13732Workaround,
     collectionPrefix,
     schemaCacheTTL,
     enableSingleSchemaCache,
@@ -171,8 +170,7 @@ export function getDatabaseController(
   }
   return new DatabaseController(
     databaseAdapter,
-    new SchemaCache(cacheController, schemaCacheTTL, enableSingleSchemaCache),
-    skipMongoDBServer13732Workaround
+    new SchemaCache(cacheController, schemaCacheTTL, enableSingleSchemaCache)
   );
 }
 

src/Options/Definitions.js

@@ -320,12 +320,6 @@ module.exports.ParseServerOptions = {
     help: 'Disables console output',
     action: parsers.booleanParser,
   },
-  skipMongoDBServer13732Workaround: {
-    env: 'PARSE_SKIP_MONGODB_SERVER_13732_WORKAROUND',
-    help: 'Circumvent Parse workaround for historical MongoDB bug SERVER-13732',
-    action: parsers.booleanParser,
-    default: false,
-  },
   startLiveQueryServer: {
     env: 'PARSE_SERVER_START_LIVE_QUERY_SERVER',
     help: 'Starts the liveQuery server',

src/Options/docs.js

@@ -57,7 +57,6 @@
  * @property {String} serverURL URL to your parse server with http:// or https://.
  * @property {Number} sessionLength Session duration, in seconds, defaults to 1 year
  * @property {Boolean} silent Disables console output
- * @property {Boolean} skipMongoDBServer13732Workaround Circumvent Parse workaround for historical MongoDB bug SERVER-13732
  * @property {Boolean} startLiveQueryServer Starts the liveQuery server
  * @property {String[]} userSensitiveFields Personally identifiable information fields in the user table the should be removed for non-authorized users. Deprecated @see protectedFields
  * @property {Boolean} verbose Set the logging to verbose

src/Options/index.js

@@ -58,10 +58,6 @@ export interface ParseServerOptions {
   databaseOptions: ?any;
   /* Adapter module for the database */
   databaseAdapter: ?Adapter<StorageAdapter>;
-  /* Circumvent Parse workaround for historical MongoDB bug SERVER-13732
-  :ENV: PARSE_SKIP_MONGODB_SERVER_13732_WORKAROUND
-  :DEFAULT: false */
-  skipMongoDBServer13732Workaround: ?boolean;
   /* Full path to your cloud code main.js */
   cloud: ?string;
   /* A collection prefix for the classes

src/RestWrite.js

@@ -781,7 +781,9 @@ RestWrite.prototype._validatePasswordHistory = function() {
               return Promise.reject(
                 new Parse.Error(
                   Parse.Error.VALIDATION_ERROR,
-                  `New password should not be the same as last ${this.config.passwordPolicy.maxPasswordHistory} passwords.`
+                  `New password should not be the same as last ${
+                    this.config.passwordPolicy.maxPasswordHistory
+                  } passwords.`
                 )
               );
             throw err;