Move from q to when

1602 · Jul 23, 2015 · 7332c60 · 7332c60
1 parent 49450de
commit 7332c60
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/lib/model.js b/lib/model.js
@@ -11,7 +11,7 @@ var util = require('util');
 var validations = require('./validations.js');
 var ValidationError = validations.ValidationError;
 var List = require('./list.js');
-var q = require('q');
+var when = require('when');
 require('./hooks.js');
 require('./relations.js');
 require('./include.js');
@@ -347,10 +347,10 @@ AbstractClass.create = function (data, callback) {
 
 function connection(schema) {
     if (schema.connected) {
-        return q.Promise.resolve();
+        return when.Promise.resolve();
     } else {
         if (schema.connecting) {
-            return new q.Promise(function(resolve) {
+            return new when.Promise(function(resolve) {
                 schema.once('connected', function () {
                     resolve();
                 });
@@ -981,7 +981,7 @@ function wrapWithPromise(fn, isClassMethod) {
         var self = this;
         var Model = isClassMethod ? self : self.constructor;
         return connection(Model.schema).then(function() {
-            return new q.Promise(function(resolve, reject) {
+            return new when.Promise(function(resolve, reject) {
                 args.push(function(err, result) {
                     if (err) {
                         reject(err);

diff --git a/lib/schema.js b/lib/schema.js
@@ -7,7 +7,7 @@ var EventEmitter = require('events').EventEmitter;
 var util = require('util');
 var path = require('path');
 var fs = require('fs');
-var q = require('q');
+var when = require('when');
 
 var existsSync = fs.existsSync || path.existsSync;
 
@@ -132,7 +132,7 @@ function Schema(name, settings) {
     schema.connect = function(cb) {
         var schema = this;
         schema.connecting = true;
-        return new q.Promise(function(resolve, reject) {
+        return new when.Promise(function(resolve, reject) {
             if (!schema.adapter.connect) {
                 return process.nextTick(function() {
                     schema.connecting = false;

diff --git a/package.json b/package.json
@@ -74,7 +74,7 @@
   },
   "dependencies": {
     "inflection": "=1.2.7",
-    "q": "=1.4.1",
+    "when": "3.7.3",
     "should": "=6.0.3"
   },
   "jshintConfig": {