fix defaults injection for databaseOptions

Author: mtrezza

spec/MongoStorageAdapter.spec.js

@@ -142,11 +142,14 @@ describe_only_db('mongo')('MongoStorageAdapter', () => {
     expect(results.length).toEqual(3);
   });
 
-  it('defaults batchSize to undefined when not configured', () => {
-    const adapter = new MongoStorageAdapter({
-      uri: databaseURI,
+  it('defaults batchSize to 1000', async () => {
+    await reconfigureServer({
+      databaseURI: databaseURI,
+      collectionPrefix: 'test_',
+      databaseAdapter: undefined,
     });
-    expect(adapter._batchSize).toBeUndefined();
+    const adapter = Config.get(Parse.applicationId).database.adapter;
+    expect(adapter._batchSize).toEqual(1000);
   });
 
   it('stores pointers with a _p_ prefix', done => {

src/ParseServer.ts

@@ -9,7 +9,7 @@ var batch = require('./batch'),
   fs = require('fs');
 
 import { ParseServerOptions, LiveQueryServerOptions } from './Options';
-import defaults from './defaults';
+import defaults, { DatabaseOptionDefaults } from './defaults';
 import * as logging from './logger';
 import Config from './Config';
 import PromiseRouter from './PromiseRouter';
@@ -593,6 +593,20 @@ function injectDefaults(options: ParseServerOptions) {
     }
   });
 
+  // Inject defaults for database options; only when no explicit database adapter is set,
+  // because an explicit adapter manages its own options and passing databaseOptions alongside
+  // it would cause a conflict error in getDatabaseController.
+  if (!options.databaseAdapter) {
+    if (!options.databaseOptions) {
+      options.databaseOptions = {};
+    }
+    Object.keys(DatabaseOptionDefaults).forEach(key => {
+      if (!Object.prototype.hasOwnProperty.call(options.databaseOptions, key)) {
+        options.databaseOptions[key] = DatabaseOptionDefaults[key];
+      }
+    });
+  }
+
   if (!Object.prototype.hasOwnProperty.call(options, 'serverURL')) {
     options.serverURL = `http://localhost:${options.port}${options.mountPath}`;
   }

src/defaults.js

@@ -1,5 +1,5 @@
 import { nullParser } from './Options/parsers';
-const { ParseServerOptions } = require('./Options/Definitions');
+const { ParseServerOptions, DatabaseOptions } = require('./Options/Definitions');
 const logsFolder = (() => {
   let folder = './logs/';
   if (typeof process !== 'undefined' && process.env.TESTING === '1') {
@@ -34,6 +34,14 @@ const computedDefaults = {
 export default Object.assign({}, DefinitionDefaults, computedDefaults);
 export const DefaultMongoURI = DefinitionDefaults.databaseURI;
 
+export const DatabaseOptionDefaults = Object.keys(DatabaseOptions).reduce((memo, key) => {
+  const def = DatabaseOptions[key];
+  if (Object.prototype.hasOwnProperty.call(def, 'default')) {
+    memo[key] = def.default;
+  }
+  return memo;
+}, {});
+
 // Parse Server-specific database options that should be filtered out
 // before passing to MongoDB client
 export const ParseServerDatabaseOptions = [