feat(promises): when calling then/spread from custom event emitter make sure to …

…proxy sql events on to the new promise

lib/emitters/custom-event-emitter.js

@@ -233,10 +233,13 @@ module.exports = (function() {
     onFulfilled = bindToProcess(onFulfilled)
     onFulfilled = bindToProcess(onFulfilled)
     onRejected = bindToProcess(onRejected)
     onRejected = bindToProcess(onRejected)
 
 
-    return new Promise(function (resolve, reject) {
+    var promise = (new Promise(function (resolve, reject) {
       self.on('error', reject)
       self.on('error', reject)
           .on('success', resolve)
           .on('success', resolve)
-    }).then(onFulfilled, onRejected)
+    })).then(onFulfilled, onRejected)
+
+    this.proxySql(promise);
+    return promise;
   }
   }
 
 
   /**
   /**
@@ -252,12 +255,15 @@ module.exports = (function() {
     onFulfilled = bindToProcess(onFulfilled)
     onFulfilled = bindToProcess(onFulfilled)
     onRejected = bindToProcess(onRejected)
     onRejected = bindToProcess(onRejected)
 
 
-    return new Promise(function (resolve, reject) {
+    var promise = (new Promise(function (resolve, reject) {
       self.on('error', reject)
       self.on('error', reject)
           .on('success', function () {
           .on('success', function () {
             resolve(Array.prototype.slice.apply(arguments)) // Transform args to an array
             resolve(Array.prototype.slice.apply(arguments)) // Transform args to an array
           })
           })
-    }).spread(onFulfilled, onRejected)
+    })).spread(onFulfilled, onRejected)
+
+    this.proxySql(promise);
+    return promise;
   }
   }
 
 
   /**
   /**