Postgres adapter (#2012)

* Remove adaptiveCollection * Remove an adaptiveCollection use * Remove an adaptiveCollection * make adaptiveCollection private * Remove collection from mongoadapter * Move schema collection usage into mongo adapter * stop relying on mongo format for removing join tables * reduce usage of schemaCollection * remove uses of _collection * Move CLP setting into mongo adapter * remove all uses of schemaCollection * make schemaCollection private * remove transform from schemaCollection * rename some stuff * Tweak paramaters and stuff * reorder some params * reorder find() arguments * finishsh touching up argument order * Accept a database adapter as a parameter * First passing test with postgres! * Actually use the provided className * index on unique-indexes: c454180 Revert "Log objects rather than JSON stringified objects (#1922)" * Start dealing with test shittyness * Make specific server config for tests async * Fix email validation * Fix broken cloud code * Save callback to variable * undo * Fix tests * Setup travis * fix travis maybe * try removing db user * indentation? * remove postgres version setting * sudo maybe? * use postgres username * fix check for _PushStatus * excludes * remove db=mongo * allow postgres to fail * Fix allow failure * postgres 9.4 * Remove mongo implementations and fix test * Fix test leaving behind connections
2016-06-12 16:35:13 -07:00
parent d559cb2382
commit 5518edc2a5
20 changed files with 499 additions and 318 deletions
--- a/spec/MongoStorageAdapter.spec.js
+++ b/spec/MongoStorageAdapter.spec.js
@@ -9,7 +9,7 @@ const databaseURI = 'mongodb://localhost:27017/parseServerMongoAdapterTestDataba
 describe('MongoStorageAdapter', () => {
  beforeEach(done => {
    new MongoStorageAdapter({ uri: databaseURI })
-    .deleteAllSchemas()
+    .deleteAllClasses()
    .then(done, fail);
  });

@@ -49,7 +49,7 @@ describe('MongoStorageAdapter', () => {

  it('stores objectId in _id', done => {
    let adapter = new MongoStorageAdapter({ uri: databaseURI });
-    adapter.createObject('Foo', { objectId: 'abcde' }, { fields: { objectId: 'String' } })
+    adapter.createObject('Foo', {}, { objectId: 'abcde' })
    .then(() => adapter._rawFind('Foo', {}))
    .then(results => {
      expect(results.length).toEqual(1);
@@ -70,10 +70,10 @@ describe('MongoStorageAdapter', () => {
      }
    };
    let adapter = new MongoStorageAdapter({ uri: databaseURI });
-    adapter.createObject('APointerDarkly', obj, { fields: {
+    adapter.createObject('APointerDarkly', { fields: {
      objectId: { type: 'String' },
      aPointer: { type: 'Pointer', targetClass: 'JustThePointer' },
-    }})
+    }}, obj)
    .then(() => adapter._rawFind('APointerDarkly', {}))
    .then(results => {
      expect(results.length).toEqual(1);
@@ -90,7 +90,7 @@ describe('MongoStorageAdapter', () => {
    let adapter = new MongoStorageAdapter({ uri: databaseURI });
    let schema = { fields : { subdoc: { type: 'Object' } } };
    let obj = { subdoc: {foo: 'bar', wu: 'tan'} };
-    adapter.createObject('MyClass', obj, schema)
+    adapter.createObject('MyClass', schema, obj)
    .then(() => adapter._rawFind('MyClass', {}))
    .then(results => {
      expect(results.length).toEqual(1);
@@ -99,7 +99,7 @@ describe('MongoStorageAdapter', () => {
      expect(mob.subdoc.foo).toBe('bar');
      expect(mob.subdoc.wu).toBe('tan');
      let obj = { 'subdoc.wu': 'clan' };
-      return adapter.findOneAndUpdate('MyClass', {}, schema, obj);
+      return adapter.findOneAndUpdate('MyClass', schema, {}, obj);
    })
    .then(() => adapter._rawFind('MyClass', {}))
    .then(results => {
@@ -127,7 +127,7 @@ describe('MongoStorageAdapter', () => {
      object: { type: 'Object' },
      date: { type: 'Date' },
    } };
-    adapter.createObject('MyClass', obj, schema)
+    adapter.createObject('MyClass', schema, obj)
    .then(() => adapter._rawFind('MyClass', {}))
    .then(results => {
      expect(results.length).toEqual(1);
@@ -135,7 +135,7 @@ describe('MongoStorageAdapter', () => {
      expect(mob.array instanceof Array).toBe(true);
      expect(typeof mob.object).toBe('object');
      expect(mob.date instanceof Date).toBe(true);
-      return adapter.find('MyClass', {}, schema, {});
+      return adapter.find('MyClass', schema, {}, {});
    })
    .then(results => {
      expect(results.length).toEqual(1);
--- a/spec/OAuth.spec.js
+++ b/spec/OAuth.spec.js
@@ -284,9 +284,9 @@ describe('OAuth', function() {
               "Expiration should be cleared");
            // make sure the auth data is properly deleted
            var config = new Config(Parse.applicationId);
-            config.database.adapter.find('_User', { objectId: model.id }, {
+            config.database.adapter.find('_User', {
              fields: Object.assign({}, defaultColumns._Default, defaultColumns._Installation),
-            }, {})
+            }, { objectId: model.id }, {})
            .then(res => {
              expect(res.length).toBe(1);
              expect(res[0]._auth_data_myoauth).toBeUndefined();
--- a/spec/ParseAPI.spec.js
+++ b/spec/ParseAPI.spec.js
@@ -20,7 +20,10 @@ describe('miscellaneous', function() {
      expect(typeof obj.id).toBe('string');
      expect(typeof obj.createdAt.toGMTString()).toBe('string');
      done();
-    }, function(err) { console.log(err); });
+    }, error => {
+      fail(JSON.stringify(error));
+      done();
+    });
  });

  it('get a TestObject', function(done) {
@@ -122,81 +125,63 @@ describe('miscellaneous', function() {
  });

  it('ensure that if people already have duplicate users, they can still sign up new users', done => {
-    reconfigureServer({})
+    let config = new Config('test');
    // Remove existing data to clear out unique index
-    .then(TestUtils.destroyAllDataPermanently)
+    TestUtils.destroyAllDataPermanently()
+    .then(() => config.database.adapter.createObject('_User', requiredUserFields, { objectId: 'x', username: 'u' }))
+    .then(() => config.database.adapter.createObject('_User', requiredUserFields, { objectId: 'y', username: 'u' }))
+    // Create a new server to try to recreate the unique indexes
+    .then(reconfigureServer)
+    .catch(() => {
+      let user = new Parse.User();
+      user.setPassword('asdf');
+      user.setUsername('zxcv');
+      // Sign up with new email still works
+      return user.signUp().catch(fail);
+    })
    .then(() => {
-      let adapter = new MongoStorageAdapter({
-        uri: 'mongodb://localhost:27017/parseServerMongoAdapterTestDatabase',
-        collectionPrefix: 'test_',
-      });
-      adapter.createObject('_User', { objectId: 'x', username: 'u' }, requiredUserFields)
-      .then(() => adapter.createObject('_User', { objectId: 'y', username: 'u' }, requiredUserFields))
-      .then(() => {
-        let user = new Parse.User();
-        user.setPassword('asdf');
-        user.setUsername('zxcv');
-        return user.signUp();
-      })
-      .then(() => {
-        let user = new Parse.User();
-        user.setPassword('asdf');
-        user.setUsername('u');
-        user.signUp()
-        .catch(error => {
-          expect(error.code).toEqual(Parse.Error.USERNAME_TAKEN);
-          done();
-        });
-      })
-      .catch(error => {
-        fail(JSON.stringify(error));
-        done();
-      });
-    }, () => {
-      fail('destroyAllDataPermanently failed')
+      let user = new Parse.User();
+      user.setPassword('asdf');
+      user.setUsername('u');
+      // sign up with duplicate username doens't
+      return user.signUp()
+    })
+    .catch(error => {
+      expect(error.code).toEqual(Parse.Error.USERNAME_TAKEN);
      done();
-    });
+    })
  });

  it('ensure that if people already have duplicate emails, they can still sign up new users', done => {
-    reconfigureServer({})
-    // Wipe out existing database with unique index so we can create a duplicate user
-    .then(TestUtils.destroyAllDataPermanently)
+    let config = new Config('test');
+    // Remove existing data to clear out unique index
+    TestUtils.destroyAllDataPermanently()
+    .then(() => config.database.adapter.createObject('_User', requiredUserFields, { objectId: 'x', email: 'a@b.c' }))
+    .then(() => config.database.adapter.createObject('_User', requiredUserFields, { objectId: 'y', email: 'a@b.c' }))
+    .then(reconfigureServer)
+    .catch(() => {
+      let user = new Parse.User();
+      user.setPassword('asdf');
+      user.setUsername('qqq');
+      user.setEmail('unique@unique.unique');
+      return user.signUp().catch(fail);
+    })
    .then(() => {
-      let adapter = new MongoStorageAdapter({
-        uri: 'mongodb://localhost:27017/parseServerMongoAdapterTestDatabase',
-        collectionPrefix: 'test_',
-      });
-      adapter.createObject('_User', { objectId: 'x', email: 'a@b.c' }, requiredUserFields)
-      .then(() => adapter.createObject('_User', { objectId: 'y', email: 'a@b.c' }, requiredUserFields))
-      .then(() => {
-        let user = new Parse.User();
-        user.setPassword('asdf');
-        user.setUsername('qqq');
-        user.setEmail('unique@unique.unique');
-        return user.signUp();
-      })
-      .then(() => {
-        let user = new Parse.User();
-        user.setPassword('asdf');
-        user.setUsername('www');
-        user.setEmail('a@b.c');
-        user.signUp()
-        .catch(error => {
-          expect(error.code).toEqual(Parse.Error.EMAIL_TAKEN);
-          done();
-        });
-      })
-      .catch(error => {
-        fail(JSON.stringify(error));
-        done();
-      });
+      let user = new Parse.User();
+      user.setPassword('asdf');
+      user.setUsername('www');
+      user.setEmail('a@b.c');
+      return user.signUp()
+    })
+    .catch(error => {
+      expect(error.code).toEqual(Parse.Error.EMAIL_TAKEN);
+      done();
    });
  });

  it('ensure that if you try to sign up a user with a unique username and email, but duplicates in some other field that has a uniqueness constraint, you get a regular duplicate value error', done => {
    let config = new Config('test');
-    config.database.adapter.ensureUniqueness('_User', ['randomField'], requiredUserFields)
+    config.database.adapter.ensureUniqueness('_User', requiredUserFields, ['randomField'])
    .then(() => {
      let user = new Parse.User();
      user.setPassword('asdf');
@@ -228,8 +213,7 @@ describe('miscellaneous', function() {
          expect(typeof user.id).toEqual('string');
          expect(user.get('password')).toBeUndefined();
          expect(user.getSessionToken()).not.toBeUndefined();
-          Parse.User.logOut();
-          done();
+          Parse.User.logOut().then(done);
        }, error: function(error) {
          fail(error);
        }
@@ -366,7 +350,7 @@ describe('miscellaneous', function() {
      return obj.save();
    }).then(() => {
      let config = new Config(appId);
-      return config.database.adapter.find('TestObject', {}, { fields: {} }, {});
+      return config.database.adapter.find('TestObject', { fields: {} }, {}, {});
    }).then((results) => {
      expect(results.length).toEqual(1);
      expect(results[0]['foo']).toEqual('bar');
--- a/spec/ParseGlobalConfig.spec.js
+++ b/spec/ParseGlobalConfig.spec.js
@@ -7,9 +7,12 @@ let Config = require('../src/Config');
 describe('a GlobalConfig', () => {
  beforeEach(done => {
    let config = new Config('test');
-    config.database.adapter.adaptiveCollection('_GlobalConfig')
-      .then(coll => coll.upsertOne({ '_id': 1 }, { $set: { params: { companies: ['US', 'DK'] } } }))
-      .then(() => { done(); });
+    config.database.adapter.upsertOneObject(
+      '_GlobalConfig',
+      { fields: {} },
+      { objectId: 1 },
+      { params: { companies: ['US', 'DK'] } }
+    ).then(done);
  });

  it('can be retrieved', (done) => {
@@ -90,22 +93,23 @@ describe('a GlobalConfig', () => {

  it('failed getting config when it is missing', (done) => {
    let config = new Config('test');
-    config.database.adapter.adaptiveCollection('_GlobalConfig')
-      .then(coll => coll.deleteOne({ '_id': 1 }))
-      .then(() => {
-        request.get({
-          url    : 'http://localhost:8378/1/config',
-          json   : true,
-          headers: {
-            'X-Parse-Application-Id': 'test',
-            'X-Parse-Master-Key'    : 'test'
-          }
-        }, (error, response, body) => {
-          expect(response.statusCode).toEqual(200);
-          expect(body.params).toEqual({});
-          done();
-        });
+    config.database.adapter.deleteObjectsByQuery(
+      '_GlobalConfig',
+      { fields: { params: { __type: 'String' } } },
+      { objectId: 1 }
+    ).then(() => {
+      request.get({
+        url    : 'http://localhost:8378/1/config',
+        json   : true,
+        headers: {
+          'X-Parse-Application-Id': 'test',
+          'X-Parse-Master-Key'    : 'test'
+        }
+      }, (error, response, body) => {
+        expect(response.statusCode).toEqual(200);
+        expect(body.params).toEqual({});
+        done();
      });
+    });
  });
-
 });
--- a/spec/ParseHooks.spec.js
+++ b/spec/ParseHooks.spec.js
@@ -10,11 +10,11 @@ Parse.Hooks = require("../src/cloud-code/Parse.Hooks");

 var port = 12345;
 var hookServerURL = "http://localhost:"+port;
+let AppCache = require('../src/cache').AppCache;

 var app = express();
 app.use(bodyParser.json({ 'type': '*/*' }))
 app.listen(12345);
-let AppCache = require('../src/cache').AppCache;

 describe('Hooks', () => {

--- a/spec/ParseInstallation.spec.js
+++ b/spec/ParseInstallation.spec.js
@@ -24,7 +24,7 @@ describe('Installations', () => {
      'deviceType': device
    };
    rest.create(config, auth.nobody(config), '_Installation', input)
-    .then(() => database.adapter.find('_Installation', {}, installationSchema, {}))
+    .then(() => config.database.adapter.find('_Installation', installationSchema, {}, {}))
    .then(results => {
      expect(results.length).toEqual(1);
      var obj = results[0];
@@ -42,7 +42,7 @@ describe('Installations', () => {
      'deviceType': device
    };
    rest.create(config, auth.nobody(config), '_Installation', input)
-    .then(() => database.adapter.find('_Installation', {}, installationSchema, {}))
+    .then(() => config.database.adapter.find('_Installation', installationSchema, {}, {}))
    .then(results => {
      expect(results.length).toEqual(1);
      var obj = results[0];
@@ -60,7 +60,7 @@ describe('Installations', () => {
      'deviceType': device
    };
    rest.create(config, auth.nobody(config), '_Installation', input)
-    .then(() => database.adapter.find('_Installation', {}, installationSchema, {}))
+    .then(() => config.database.adapter.find('_Installation', installationSchema, {}, {}))
    .then(results => {
      expect(results.length).toEqual(1);
      var obj = results[0];
@@ -79,7 +79,7 @@ describe('Installations', () => {
      'channels': ['foo', 'bar']
    };
    rest.create(config, auth.nobody(config), '_Installation', input)
-    .then(() => database.adapter.find('_Installation', {}, installationSchema, {}))
+    .then(() => database.adapter.find('_Installation', installationSchema, {}, {}))
    .then(results => {
      expect(results.length).toEqual(1);
      var obj = results[0];
@@ -102,7 +102,7 @@ describe('Installations', () => {
      'channels': ['foo', 'bar']
    };
    rest.create(config, auth.nobody(config), '_Installation', input)
-    .then(() => database.adapter.find('_Installation', {}, installationSchema, {}))
+    .then(() => database.adapter.find('_Installation', installationSchema, {}, {}))
    .then(results => {
      expect(results.length).toEqual(1);
      var obj = results[0];
@@ -200,7 +200,7 @@ describe('Installations', () => {
      'custom': 'allowed'
    };
  rest.create(config, auth.nobody(config), '_Installation', input)
-    .then(() => database.adapter.find('_Installation', {}, installationSchema, {}))
+    .then(() => database.adapter.find('_Installation', installationSchema, {}, {}))
    .then(results => {
      expect(results.length).toEqual(1);
      var obj = results[0];
@@ -224,7 +224,7 @@ describe('Installations', () => {
    var firstObject;
    var secondObject;
    rest.create(config, auth.nobody(config), '_Installation', input)
-    .then(() => database.adapter.find('_Installation', {}, installationSchema, {}))
+    .then(() => database.adapter.find('_Installation', installationSchema, {}, {}))
    .then(results => {
      expect(results.length).toEqual(1);
      firstObject = results[0];
@@ -233,7 +233,7 @@ describe('Installations', () => {
      input['foo'] = 'bar';
      return rest.create(config, auth.nobody(config), '_Installation', input);
    })
-    .then(() => database.adapter.find('_Installation', {}, installationSchema, {}))
+    .then(() => database.adapter.find('_Installation', installationSchema, {}, {}))
    .then(results => {
      expect(results.length).toEqual(1);
      secondObject = results[0];
@@ -263,13 +263,13 @@ describe('Installations', () => {
    var firstObject;
    var secondObject;
    rest.create(config, auth.nobody(config), '_Installation', input1)
-    .then(() => database.adapter.find('_Installation', {}, installationSchema, {}))
+    .then(() => database.adapter.find('_Installation', installationSchema, {}, {}))
    .then(results => {
      expect(results.length).toEqual(1);
      firstObject = results[0];
      return rest.create(config, auth.nobody(config), '_Installation', input2);
    })
-    .then(() => database.adapter.find('_Installation', {}, installationSchema, {}))
+    .then(() => database.adapter.find('_Installation', installationSchema, {}, {}))
    .then(results => {
      expect(results.length).toEqual(2);
      if (results[0]['_id'] == firstObject._id) {
@@ -279,7 +279,7 @@ describe('Installations', () => {
      }
      return rest.create(config, auth.nobody(config), '_Installation', input3);
    })
-    .then(() => database.adapter.find('_Installation', {}, installationSchema, {}))
+    .then(() => database.adapter.find('_Installation', installationSchema, {}, {}))
    .then(results => {
      expect(results.length).toEqual(1);
      expect(results[0]['_id']).toEqual(secondObject._id);
@@ -325,7 +325,7 @@ describe('Installations', () => {
      channels: ['foo', 'bar']
    };
    rest.create(config, auth.nobody(config), '_Installation', input)
-    .then(() => database.adapter.find('_Installation', {}, installationSchema, {}))
+    .then(() => database.adapter.find('_Installation', installationSchema, {}, {}))
    .then(results => {
      expect(results.length).toEqual(1);
      var id = results[0].objectId;
@@ -334,7 +334,7 @@ describe('Installations', () => {
      };
      return rest.update(config, auth.nobody(config), '_Installation', id, update);
    })
-    .then(() => database.adapter.find('_Installation', {}, installationSchema, {}))
+    .then(() => database.adapter.find('_Installation', installationSchema, {}, {}))
    .then(results => {
      expect(results.length).toEqual(1);
      expect(results[0].channels.length).toEqual(1);
@@ -356,7 +356,7 @@ describe('Installations', () => {
      'channels': ['foo', 'bar']
    };
    rest.create(config, auth.nobody(config), '_Installation', input)
-    .then(() => database.adapter.find('_Installation', {}, installationSchema, {}))
+    .then(() => database.adapter.find('_Installation', installationSchema, {}, {}))
    .then(results => {
      expect(results.length).toEqual(1);
      input = { 'installationId': installId2 };
@@ -379,7 +379,7 @@ describe('Installations', () => {
      'channels': ['foo', 'bar']
    };
    rest.create(config, auth.nobody(config), '_Installation', input)
-    .then(() => database.adapter.find('_Installation', {}, installationSchema, {}))
+    .then(() => database.adapter.find('_Installation', installationSchema, {}, {}))
    .then(results => {
      expect(results.length).toEqual(1);
      input = { 'deviceToken': b };
@@ -403,7 +403,7 @@ describe('Installations', () => {
      'channels': ['foo', 'bar']
    };
    rest.create(config, auth.nobody(config), '_Installation', input)
-    .then(() => database.adapter.find('_Installation', {}, installationSchema, {}))
+    .then(() => database.adapter.find('_Installation', installationSchema, {}, {}))
    .then(results => {
      expect(results.length).toEqual(1);
      input = {
@@ -413,7 +413,7 @@ describe('Installations', () => {
      };
      return rest.update(config, auth.nobody(config), '_Installation', results[0].objectId, input);
    })
-    .then(() => database.adapter.find('_Installation', {}, installationSchema, {}))
+    .then(() => database.adapter.find('_Installation', installationSchema, {}, {}))
    .then(results => {
      expect(results.length).toEqual(1);
      expect(results[0].deviceToken).toEqual(u);
@@ -429,7 +429,7 @@ describe('Installations', () => {
      'channels': ['foo', 'bar']
    };
    rest.create(config, auth.nobody(config), '_Installation', input)
-    .then(() => database.adapter.find('_Installation', {}, installationSchema, {}))
+    .then(() => database.adapter.find('_Installation', installationSchema, {}, {}))
    .then(results => {
      expect(results.length).toEqual(1);
      input = {
@@ -453,7 +453,7 @@ describe('Installations', () => {
      'channels': ['foo', 'bar']
    };
    rest.create(config, auth.nobody(config), '_Installation', input)
-    .then(() => database.adapter.find('_Installation', {}, installationSchema, {}))
+    .then(() => database.adapter.find('_Installation', installationSchema, {}, {}))
    .then(results => {
      expect(results.length).toEqual(1);
      input = {
@@ -461,7 +461,7 @@ describe('Installations', () => {
      };
      return rest.update(config, auth.nobody(config), '_Installation', results[0].objectId, input);
    })
-    .then(() => database.adapter.find('_Installation', {}, installationSchema, {}))
+    .then(() => database.adapter.find('_Installation', installationSchema, {}, {}))
    .then(results => {
      expect(results.length).toEqual(1);
      expect(results[0]['custom']).toEqual('allowed');
@@ -488,11 +488,11 @@ describe('Installations', () => {
      };
      return rest.create(config, auth.nobody(config), '_Installation', input);
    })
-    .then(() => database.adapter.find('_Installation', {installationId: installId1}, installationSchema, {}))
+    .then(() => database.adapter.find('_Installation', installationSchema, {installationId: installId1}, {}))
    .then(results => {
      firstObject = results[0];
      expect(results.length).toEqual(1);
-      return database.adapter.find('_Installation', {installationId: installId2}, installationSchema, {});
+      return database.adapter.find('_Installation', installationSchema, {installationId: installId2}, {});
    }).then(results => {
      expect(results.length).toEqual(1);
      secondObject = results[0];
@@ -503,7 +503,7 @@ describe('Installations', () => {
      };
      return rest.update(config, auth.nobody(config), '_Installation', secondObject.objectId, input);
    })
-    .then(() => database.adapter.find('_Installation', {objectId: firstObject.objectId}, installationSchema, {}))
+    .then(() => database.adapter.find('_Installation', installationSchema, {objectId: firstObject.objectId}, {}))
    .then(results => {
      // The first object should have been deleted
      expect(results.length).toEqual(0);
@@ -530,11 +530,11 @@ describe('Installations', () => {
      };
      return rest.create(config, auth.nobody(config), '_Installation', input);
    })
-    .then(() => database.adapter.find('_Installation', {installationId: installId1}, installationSchema, {}))
+    .then(() => database.adapter.find('_Installation', installationSchema, {installationId: installId1}, {}))
    .then((results) => {
      expect(results.length).toEqual(1);
      firstObject = results[0];
-      return database.adapter.find('_Installation', {installationId: installId2}, installationSchema, {});
+      return database.adapter.find('_Installation', installationSchema, {installationId: installId2}, {});
    })
    .then(results => {
      expect(results.length).toEqual(1);
@@ -546,7 +546,7 @@ describe('Installations', () => {
      };
      return rest.update(config, auth.nobody(config), '_Installation', secondObject.objectId, input);
    })
-    .then(() => database.adapter.find('_Installation', {objectId: firstObject.objectId}, installationSchema, {}))
+    .then(() => database.adapter.find('_Installation', installationSchema, {objectId: firstObject.objectId}, {}))
    .then(results => {
      // The first object should have been deleted
      expect(results.length).toEqual(0);
@@ -570,7 +570,7 @@ describe('Installations', () => {
      input.appIdentifier = 'bar';
      return rest.create(config, auth.nobody(config), '_Installation', input);
    })
-    .then(() => database.adapter.find('_Installation', {}, installationSchema, {}))
+    .then(() => database.adapter.find('_Installation', installationSchema, {}, {}))
    .then(results => {
      // The first object should have been deleted during merge
      expect(results.length).toEqual(1);
@@ -587,7 +587,7 @@ describe('Installations', () => {
      'deviceType': 'ios'
    };
    rest.create(config, auth.nobody(config), '_Installation', input)
-    .then(() => database.adapter.find('_Installation', {}, installationSchema, {}))
+    .then(() => database.adapter.find('_Installation', installationSchema, {}, {}))
    .then(results => {
      expect(results.length).toEqual(1);
      input = {
@@ -596,7 +596,7 @@ describe('Installations', () => {
      };
      return rest.update(config, auth.nobody(config), '_Installation', results[0].objectId, input);
    })
-    .then(() => database.adapter.find('_Installation', {}, installationSchema, {}))
+    .then(() => database.adapter.find('_Installation', installationSchema, {}, {}))
    .then(results => {
      expect(results.length).toEqual(1);
      expect(results[0].installationId).toEqual(installId);
@@ -621,7 +621,7 @@ describe('Installations', () => {
      };
      return rest.create(config, auth.nobody(config), '_Installation', input);
    })
-    .then(() => database.adapter.find('_Installation', { deviceToken: t }, installationSchema, {}))
+    .then(() => database.adapter.find('_Installation', installationSchema, { deviceToken: t }, {}))
    .then(results => {
      expect(results.length).toEqual(1);
      input = {
@@ -631,7 +631,7 @@ describe('Installations', () => {
      };
      return rest.update(config, auth.nobody(config), '_Installation', results[0].objectId, input);
    })
-    .then(() => database.adapter.find('_Installation', {}, installationSchema, {}))
+    .then(() => database.adapter.find('_Installation', installationSchema, {}, {}))
    .then(results => {
      expect(results.length).toEqual(1);
      expect(results[0].installationId).toEqual(installId);
@@ -656,7 +656,7 @@ describe('Installations', () => {
      };
      return rest.create(config, auth.nobody(config), '_Installation', input);
    })
-    .then(() => database.adapter.find('_Installation', { deviceToken: t }, installationSchema, {}))
+    .then(() => database.adapter.find('_Installation', installationSchema, { deviceToken: t }, {}))
    .then(results => {
      expect(results.length).toEqual(1);
      input = {
@@ -670,7 +670,7 @@ describe('Installations', () => {
      };
      return rest.update(config, auth.nobody(config), '_Installation', results[0].objectId, input);
    })
-    .then(() => database.adapter.find('_Installation', {}, installationSchema, {}))
+    .then(() => database.adapter.find('_Installation', installationSchema, {}, {}))
    .then(results => {
      expect(results.length).toEqual(1);
      expect(results[0].installationId).toEqual(installId);
@@ -691,7 +691,7 @@ describe('Installations', () => {
    var installObj;
    var tokenObj;
    rest.create(config, auth.nobody(config), '_Installation', input)
-    .then(() => database.adapter.find('_Installation', {}, installationSchema, {}))
+    .then(() => database.adapter.find('_Installation', installationSchema, {}, {}))
    .then(results => {
      expect(results.length).toEqual(1);
      installObj = results[0];
@@ -701,7 +701,7 @@ describe('Installations', () => {
      };
      return rest.create(config, auth.nobody(config), '_Installation', input);
    })
-    .then(() => database.adapter.find('_Installation', { deviceToken: t }, installationSchema, {}))
+    .then(() => database.adapter.find('_Installation', installationSchema, { deviceToken: t }, {}))
    .then(results => {
      expect(results.length).toEqual(1);
      tokenObj = results[0];
@@ -712,7 +712,7 @@ describe('Installations', () => {
      };
      return rest.update(config, auth.nobody(config), '_Installation', installObj.objectId, input);
    })
-    .then(() => database.adapter.find('_Installation', { objectId: tokenObj.objectId }, installationSchema, {}))
+    .then(() => database.adapter.find('_Installation', installationSchema, { objectId: tokenObj.objectId }, {}))
    .then(results => {
      expect(results.length).toEqual(1);
      expect(results[0].installationId).toEqual(installId);
@@ -731,7 +731,7 @@ describe('Installations', () => {
    var installObj;
    var tokenObj;
    rest.create(config, auth.nobody(config), '_Installation', input)
-    .then(() => database.adapter.find('_Installation', {}, installationSchema, {}))
+    .then(() => database.adapter.find('_Installation', installationSchema, {}, {}))
    .then(results => {
      expect(results.length).toEqual(1);
      installObj = results[0];
@@ -741,7 +741,7 @@ describe('Installations', () => {
      };
      return rest.create(config, auth.nobody(config), '_Installation', input);
    })
-    .then(() => database.adapter.find('_Installation', { deviceToken: t }, installationSchema, {}))
+    .then(() => database.adapter.find('_Installation', installationSchema, { deviceToken: t }, {}))
    .then(results => {
      expect(results.length).toEqual(1);
      tokenObj = results[0];
@@ -756,7 +756,7 @@ describe('Installations', () => {
      };
      return rest.update(config, auth.nobody(config), '_Installation', installObj.objectId, input);
    })
-    .then(() => database.adapter.find('_Installation', { objectId: tokenObj.objectId }, installationSchema, {}))
+    .then(() => database.adapter.find('_Installation', installationSchema, { objectId: tokenObj.objectId }, {}))
    .then(results => {
      expect(results.length).toEqual(1);
      expect(results[0].installationId).toEqual(installId);
@@ -784,7 +784,7 @@ describe('Installations', () => {
      'deviceType': 'ios'
    };
    rest.create(config, auth.nobody(config), '_Installation', input)
-    .then(() => database.adapter.find('_Installation', {}, installationSchema, {}))
+    .then(() => database.adapter.find('_Installation', installationSchema, {}, {}))
    .then(results => {
      expect(results.length).toEqual(1);
      input = {
@@ -794,7 +794,7 @@ describe('Installations', () => {
      };
      return rest.create(config, auth.nobody(config), '_Installation', input);
    })
-    .then(() => database.adapter.find('_Installation', {}, installationSchema, {}))
+    .then(() => database.adapter.find('_Installation', installationSchema, {}, {}))
    .then(results => {
      expect(results.length).toEqual(1);
      expect(results[0].deviceToken).toEqual(t);
--- a/spec/RestCreate.spec.js
+++ b/spec/RestCreate.spec.js
@@ -13,7 +13,7 @@ let database = config.database;
 describe('rest create', () => {
  it('handles _id', done => {
    rest.create(config, auth.nobody(config), 'Foo', {})
-    .then(() => database.adapter.find('Foo', {}, { fields: {} }, {}))
+    .then(() => database.adapter.find('Foo', { fields: {} }, {}, {}))
    .then(results => {
      expect(results.length).toEqual(1);
      var obj = results[0];
@@ -31,11 +31,11 @@ describe('rest create', () => {
      date: Parse._encode(now),
    };
    rest.create(config, auth.nobody(config), 'MyClass', obj)
-    .then(() => database.adapter.find('MyClass', {}, { fields: {
+    .then(() => database.adapter.find('MyClass', { fields: {
      array: { type: 'Array' },
      object: { type: 'Object' },
      date: { type: 'Date' },
-    } }, {}))
+    } }, {}, {}))
    .then(results => {
      expect(results.length).toEqual(1);
      var mob = results[0];
@@ -50,7 +50,7 @@ describe('rest create', () => {
  it('handles object and subdocument', done => {
    let obj = { subdoc: {foo: 'bar', wu: 'tan'} };
    rest.create(config, auth.nobody(config), 'MyClass', obj)
-    .then(() => database.adapter.find('MyClass', {}, { fields: {} }, {}))
+    .then(() => database.adapter.find('MyClass', { fields: {} }, {}, {}))
    .then(results => {
      expect(results.length).toEqual(1);
      let mob = results[0];
@@ -61,7 +61,7 @@ describe('rest create', () => {
      let obj = { 'subdoc.wu': 'clan' };
      return rest.update(config, auth.nobody(config), 'MyClass', mob.objectId, obj)
    })
-    .then(() => database.adapter.find('MyClass', {}, { fields: {} }, {}))
+    .then(() => database.adapter.find('MyClass', { fields: {} }, {}, {}))
    .then(results => {
      expect(results.length).toEqual(1);
      let mob = results[0];
@@ -254,10 +254,10 @@ describe('rest create', () => {
      }
    };
    rest.create(config, auth.nobody(config), 'APointerDarkly', obj)
-    .then(() => database.adapter.find('APointerDarkly', {}, { fields: {
+    .then(() => database.adapter.find('APointerDarkly', { fields: {
      foo: { type: 'String' },
      aPointer: { type: 'Pointer', targetClass: 'JustThePointer' },
-    }}, {}))
+    }}, {}, {}))
    .then(results => {
      expect(results.length).toEqual(1);
      let output = results[0];
--- a/spec/Uniqueness.spec.js
+++ b/spec/Uniqueness.spec.js
@@ -11,7 +11,7 @@ describe('Uniqueness', function() {
    obj.save().then(() => {
      expect(obj.id).not.toBeUndefined();
      let config = new Config('test');
-      return config.database.adapter.ensureUniqueness('UniqueField', ['unique'], { fields: { unique: { __type: 'String' } } })
+      return config.database.adapter.ensureUniqueness('UniqueField', { fields: { unique: { __type: 'String' } } }, ['unique'])
    })
    .then(() => {
      let obj = new Parse.Object('UniqueField');
@@ -32,10 +32,10 @@ describe('Uniqueness', function() {
    .then(() => obj.save({ ptr: obj }))
    .then(() => {
      let config = new Config('test');
-      return config.database.adapter.ensureUniqueness('UniquePointer', ['ptr'], { fields: {
+      return config.database.adapter.ensureUniqueness('UniquePointer', { fields: {
        string: { __type: 'String' },
        ptr: { __type: 'Pointer', targetClass: 'UniquePointer' }
-      } });
+      } }, ['ptr']);
    })
    .then(() => {
      let newObj = new Parse.Object('UniquePointer')
@@ -60,7 +60,7 @@ describe('Uniqueness', function() {
    Parse.Object.saveAll([o1, o2])
    .then(() => {
      let config = new Config('test');
-      return config.database.adapter.ensureUniqueness('UniqueFail', ['key'], { fields: { key: { __type: 'String' } } });
+      return config.database.adapter.ensureUniqueness('UniqueFail', { fields: { key: { __type: 'String' } } }, ['key']);
    })
    .catch(error => {
      expect(error.code).toEqual(Parse.Error.DUPLICATE_VALUE);
@@ -70,7 +70,7 @@ describe('Uniqueness', function() {

  it('can do compound uniqueness', done => {
    let config = new Config('test');
-    config.database.adapter.ensureUniqueness('CompoundUnique', ['k1', 'k2'], { fields: { k1: { __type: 'String' }, k2: { __type: 'String' } } })
+    config.database.adapter.ensureUniqueness('CompoundUnique', { fields: { k1: { __type: 'String' }, k2: { __type: 'String' } } }, ['k1', 'k2'])
    .then(() => {
      let o1 = new Parse.Object('CompoundUnique');
      o1.set('k1', 'v1');
--- a/spec/ValidationAndPasswordsReset.spec.js
+++ b/spec/ValidationAndPasswordsReset.spec.js
@@ -265,6 +265,10 @@ describe("Email Verification", () => {
        expect(error.message).toEqual('An appName, publicServerURL, and emailAdapter are required for password reset functionality.')
        done();
      });
+    })
+    .catch(error => {
+      fail(JSON.stringify(error));
+      done();
    });
  });

@@ -561,9 +565,8 @@ describe("Password Reset", () => {

            Parse.User.logIn("zxcv", "hello").then(function(user){
              let config = new Config('test');
-              config.database.adapter.adaptiveCollection('_User')
-              .then(coll => coll.find({ 'username': 'zxcv' }, { limit: 1 }))
-              .then((results) => {
+              config.database.adapter.find('_User', { fields: {} }, { 'username': 'zxcv' }, { limit: 1 })
+              .then(results => {
                // _perishable_token should be unset after reset password
                expect(results.length).toEqual(1);
                expect(results[0]['_perishable_token']).toEqual(undefined);
--- a/spec/helper.js
+++ b/spec/helper.js
@@ -11,24 +11,35 @@ var ParseServer = require('../src/index').ParseServer;
 var path = require('path');
 var TestUtils = require('../src/index').TestUtils;
 var MongoStorageAdapter = require('../src/Adapters/Storage/Mongo/MongoStorageAdapter');
+
 const GridStoreAdapter = require('../src/Adapters/Files/GridStoreAdapter').GridStoreAdapter;
+const PostgresStorageAdapter = require('../src/Adapters/Storage/Postgres/PostgresStorageAdapter');
+
+const mongoURI = 'mongodb://localhost:27017/parseServerMongoAdapterTestDatabase';
+let databaseAdapter;
+if (process.env.PARSE_SERVER_TEST_DB === 'postgres') {
+  var postgresURI = 'postgres://localhost:5432/parse_server_postgres_adapter_test_database';
+  databaseAdapter = new PostgresStorageAdapter({
+    uri: postgresURI,
+    collectionPrefix: 'test_',
+  });
+} else {
+  databaseAdapter = new MongoStorageAdapter({
+    uri: mongoURI,
+    collectionPrefix: 'test_',
+  })
+}


 var port = 8378;

-let mongoURI = 'mongodb://localhost:27017/parseServerMongoAdapterTestDatabase';
-let mongoAdapter = new MongoStorageAdapter({
-  uri: mongoURI,
-  collectionPrefix: 'test_',
-})
-
 let gridStoreAdapter = new GridStoreAdapter(mongoURI);

 // Default server configuration for tests.
 var defaultConfiguration = {
-  databaseAdapter: mongoAdapter,
  filesAdapter: gridStoreAdapter,
  serverURL: 'http://localhost:' + port + '/1',
+  databaseAdapter,
  appId: 'test',
  javascriptKey: 'test',
  dotNetKey: 'windows',
@@ -132,7 +143,7 @@ beforeEach(done => {

 afterEach(function(done) {
  Parse.Cloud._removeAllHooks();
-  mongoAdapter.getAllSchemas()
+  databaseAdapter.getAllClasses()
  .then(allSchemas => {
    allSchemas.forEach((schema) => {
      var className = schema.className;
--- a/spec/schemas.spec.js
+++ b/spec/schemas.spec.js
@@ -327,9 +327,9 @@ describe('schemas', () => {
  });

  it('responds with all fields when getting incomplete schema', done => {
-    config.database.schemaCollection().then((schema) => {
-      return schema.addSchema('_User');
-    }).then(() => {
+    config.database.loadSchema()
+    .then(schemaController => schemaController.addClassIfNotExists('_User', {}, defaultClassLevelPermissions))
+    .then(() => {
      request.get({
        url: 'http://localhost:8378/1/schemas/_User',
        headers: masterKeyHeaders,