joe/kami-parse-server
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move Mongo database property directly to mongo adapter.

Browse Source
This commit is contained in:
Nikita Lutsenko
2016-02-27 02:37:38 -08:00
parent 997da898eb
commit 7215300c1e
5 changed files with 16 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Controllers/DatabaseController.js
View File

@@ -24,15 +24,8 @@ function DatabaseController(adapter, { collectionPrefix } = {}) {
// Connects to the database. Returns a promise that resolves when the
// connection is successful.
// this.db will be populated with a Mongo "Db" object when the
// promise resolves successfully.
DatabaseController.prototype.connect = function() {
if (this.adapter.connectionPromise) {
return this.adapter.connectionPromise;
}
return this.adapter.connect().then(() => {
this.db = this.adapter.database;
});
return this.adapter.connect();
};
// Returns a promise for a Mongo collection.
@@ -47,7 +40,7 @@ DatabaseController.prototype.collection = function(className) {
DatabaseController.prototype.rawCollection = function(className) {
return this.connect().then(() => {
return this.db.collection(this.collectionPrefix + className);
return this.adapter.database.collection(this.collectionPrefix + className);
});
};
@@ -353,7 +346,7 @@ DatabaseController.prototype.deleteEverything = function() {
this.schemaPromise = null;
return this.connect().then(() => {
return this.db.collections();
return this.adapter.database.collections();
}).then((colls) => {
var promises = [];
for (var coll of colls) {