change horizontalScaling db option

Author: dplewis

spec/MongoStorageAdapter.spec.js

@@ -557,7 +557,7 @@ describe_only_db('mongo')('MongoStorageAdapter', () => {
           horizontalScaling: true,
           databaseAdapter: adapter,
         });
-        expect(adapter.horizontalScaling).toBe(true);
+        expect(adapter.enableHooks).toBe(true);
         spyOn(adapter, '_onchange');
         const schema = {
           fields: {

spec/PostgresStorageAdapter.spec.js

@@ -392,20 +392,22 @@ describe_only_db('postgres')('PostgresStorageAdapter', () => {
   });
 
   it('should watch _SCHEMA changes', async () => {
+    const enableHooks = true;
     await reconfigureServer({
       horizontalScaling: true,
     });
     const { database } = Config.get(Parse.applicationId);
     const { adapter } = database;
-    expect(adapter.horizontalScaling).toBe(true);
+    expect(adapter.enableHooks).toBe(enableHooks);
     spyOn(adapter, '_onchange');
 
     const otherInstance = new PostgresStorageAdapter({
       uri: databaseURI,
       collectionPrefix: '',
-      databaseOptions: { horizontalScaling: true },
+      databaseOptions: {},
+      enableHooks,
     });
-    expect(otherInstance.horizontalScaling).toBe(true);
+    expect(otherInstance.enableHooks).toBe(enableHooks);
     otherInstance._listenToSchema();
 
     await otherInstance.createClass('Stuff', {

src/Adapters/Storage/Mongo/MongoStorageAdapter.js

@@ -121,9 +121,14 @@ export class MongoStorageAdapter implements StorageAdapter {
   client: MongoClient;
   _maxTimeMS: ?number;
   canSortOnJoinTables: boolean;
-  horizontalScaling: boolean;
-
-  constructor({ uri = defaults.DefaultMongoURI, collectionPrefix = '', mongoOptions = {} }: any) {
+  enableHooks: boolean;
+
+  constructor({
+    uri = defaults.DefaultMongoURI,
+    collectionPrefix = '',
+    mongoOptions = {},
+    enableHooks = false,
+  }: any) {
     this._uri = uri;
     this._collectionPrefix = collectionPrefix;
     this._mongoOptions = mongoOptions;
@@ -134,8 +139,7 @@ export class MongoStorageAdapter implements StorageAdapter {
     // MaxTimeMS is not a global MongoDB client option, it is applied per operation.
     this._maxTimeMS = mongoOptions.maxTimeMS;
     this.canSortOnJoinTables = true;
-    this.horizontalScaling = !!mongoOptions.horizontalScaling;
-    delete mongoOptions.horizontalScaling;
+    this.enableHooks = enableHooks;
     delete mongoOptions.maxTimeMS;
   }
 
@@ -209,7 +213,7 @@ export class MongoStorageAdapter implements StorageAdapter {
     return this.connect()
       .then(() => this._adaptiveCollection(MongoSchemaCollectionName))
       .then(collection => {
-        if (!this._stream && this.horizontalScaling) {
+        if (!this._stream && this.enableHooks) {
           this._stream = collection._mongoCollection.watch();
           this._stream.on('change', () => this._onchange());
         }

src/Adapters/Storage/Postgres/PostgresStorageAdapter.js

@@ -796,7 +796,7 @@ const buildWhereClause = ({ schema, query, index, caseInsensitive }): WhereClaus
 
 export class PostgresStorageAdapter implements StorageAdapter {
   canSortOnJoinTables: boolean;
-  horizontalScaling: boolean;
+  enableHooks: boolean;
 
   // Private
   _collectionPrefix: string;
@@ -806,10 +806,10 @@ export class PostgresStorageAdapter implements StorageAdapter {
   _stream: any;
   _uuid: any;
 
-  constructor({ uri, collectionPrefix = '', databaseOptions = {} }: any) {
+  constructor({ uri, collectionPrefix = '', databaseOptions = {}, enableHooks = false }: any) {
     this._collectionPrefix = collectionPrefix;
-    this.horizontalScaling = !!databaseOptions.horizontalScaling;
-    delete databaseOptions.horizontalScaling;
+    this.enableHooks = enableHooks;
+
     const { client, pgp } = createClient(uri, databaseOptions);
     this._client = client;
     this._onchange = () => {};
@@ -843,7 +843,7 @@ export class PostgresStorageAdapter implements StorageAdapter {
   }
 
   async _listenToSchema() {
-    if (!this._stream && this.horizontalScaling) {
+    if (!this._stream && this.enableHooks) {
       this._stream = await this._client.connect({ direct: true });
       this._stream.client.on('notification', data => {
         const payload = JSON.parse(data.payload);

src/Controllers/index.js

@@ -154,11 +154,15 @@ export function getDatabaseController(options: ParseServerOptions): DatabaseCont
     throw 'You cannot specify both a databaseAdapter and a databaseURI/databaseOptions/collectionPrefix.';
   } else if (!databaseAdapter) {
     databaseOptions = databaseOptions || {};
-    databaseOptions.horizontalScaling = horizontalScaling;
-    databaseAdapter = getDatabaseAdapter(databaseURI, collectionPrefix, databaseOptions);
+    databaseAdapter = getDatabaseAdapter(
+      databaseURI,
+      collectionPrefix,
+      databaseOptions,
+      horizontalScaling
+    );
   } else {
     databaseAdapter = loadAdapter(databaseAdapter);
-    databaseAdapter.horizontalScaling = !!horizontalScaling;
+    databaseAdapter.enableHooks = !!horizontalScaling;
   }
   return new DatabaseController(databaseAdapter);
 }
@@ -220,7 +224,7 @@ export function getAuthDataManager(options: ParseServerOptions) {
   return authDataManager(auth, enableAnonymousUsers);
 }
 
-export function getDatabaseAdapter(databaseURI, collectionPrefix, databaseOptions) {
+export function getDatabaseAdapter(databaseURI, collectionPrefix, databaseOptions, enableHooks) {
   let protocol;
   try {
     const parsedURI = url.parse(databaseURI);
@@ -234,12 +238,14 @@ export function getDatabaseAdapter(databaseURI, collectionPrefix, databaseOption
         uri: databaseURI,
         collectionPrefix,
         databaseOptions,
+        enableHooks,
       });
     default:
       return new MongoStorageAdapter({
         uri: databaseURI,
         collectionPrefix,
         mongoOptions: databaseOptions,
+        enableHooks,
       });
   }
 }