Merge 55b2109 into bd11229

lib/adapter.js

@@ -37,47 +37,36 @@ Adapter.prototype._setDbAndClient = function(dbOrClient) {
 	}
 };
 
-Adapter.prototype.connect = function(callback) {
-	var self = this;
-
-	MongoClient.connect(
-		self.params.url,
-		self.params.options || {},
-		function(err, dbOrClient) {
-			if (err) {
-				return callback(err);
-			}
-
-			self._setDbAndClient(dbOrClient);
-
-			self.collection = self.db.collection('_migrations');
-
-			callback(null, {
-				db: self.db,
-				dropIndexIfExists: self.helpers.dropIndexIfExists
-			});
-		}
-	);
+Adapter.prototype.connect = function() {
+	return Promise.resolve()
+		.then(() => MongoClient.connect(this.params.url, this.params.options))
+		.then((dbOrClient) => {
+			this._setDbAndClient(dbOrClient);
+			this.collection = this.db.collection('_migrations');
+
+			return {
+				db: this.db,
+				dropIndexIfExists: this.helpers.dropIndexIfExists
+			};
+		});
 };
 
-Adapter.prototype.disconnect = function(callback) {
+Adapter.prototype.disconnect = function() {
 	if (this.client) {
-		this.client.close(callback);
+		return this.client.close();
 	} else if (this.db) {
-		this.db.close(callback);
+		return this.db.close();
 	} else {
-		callback();
+		return Promise.resolve();
 	}
 };
 
 Adapter.prototype.getExecutedMigrationNames = function(callback) {
-	this.collection.find({}).toArray(function(err, docs) {
-		if (err) {
-			return callback(err);
-		}
-
-		callback(null, docs.map(function(doc) { return doc._id; }));
-	});
+	return Promise.resolve()
+		.then(() => this.collection.find({}).toArray())
+		.then((docs) => {
+			return docs.map((doc) => doc._id);
+		});
 };
 
 Adapter.prototype.markExecuted = function(name, callback) {

package.json

@@ -39,5 +39,8 @@
   },
   "dependencies": {
     "mongodb-uri": "0.9.7"
+  },
+  "engines": {
+    "node": ">=4.0.0"
   }
 }

test/utils/createAdapter.js

@@ -19,11 +19,6 @@ module.exports = () => {
 
 	const adapter = new Adapter(defaultParams);
 
-	adapter.connect = promisify(adapter.connect.bind(adapter));
-	adapter.disconnect = promisify(adapter.disconnect.bind(adapter));
-	adapter.getExecutedMigrationNames = promisify(
-		adapter.getExecutedMigrationNames.bind(adapter)
-	);
 	adapter.helpers.dropIndexIfExists = promisify(
 		adapter.helpers.dropIndexIfExists
 	);