Merge pull request #575 from faazshift/master

Fixing promisified prepare implementation and promisifying returned statement

Author: sidorares

promise.js

@@ -129,19 +129,46 @@ PromiseConnection.prototype.connect = function () {
   });
 };
 
-PromiseConnection.prototype.prepare = function () {
+PromiseConnection.prototype.prepare = function (options) {
   var c = this.connection;
+  var promiseImpl = this.Promise;
   return new this.Promise(function (resolve, reject) {
-    c.prepare(function (error, statement) {
+    c.prepare(options, function (error, statement) {
       if (error) {
         reject(error);
       } else {
-        resolve(statement);
+        var wrappedStatement = new PromisePreparedStatementInfo(statement, promiseImpl);
+        resolve(wrappedStatement);
       }
     });
   });
 };
 
+function PromisePreparedStatementInfo (statement, promiseImpl) {
+  this.statement = statement;
+  this.Promise = promiseImpl;
+}
+
+PromisePreparedStatementInfo.prototype.execute = function (parameters) {
+  var s = this.statement;
+  return new this.Promise(function (resolve, reject) {
+    var done = makeDoneCb(resolve, reject);
+    if (parameters) {
+      s.execute(parameters, done);
+    } else {
+      s.execute(done);
+    }
+  });
+};
+
+PromisePreparedStatementInfo.prototype.close = function () {
+  var s = this.statement;
+  return new this.Promise(function (resolve, reject) {
+    s.close();
+    resolve();
+  });
+};
+
 // note: the callback of "changeUser" is not called on success
 // hence there is no possibility to call "resolve"
 

test/integration/test-promise-wrappers.js

@@ -104,6 +104,31 @@ function testObjParams() {
     });
 }
 
+function testPrepared() {
+  var connResolved;
+  var connPromise = createConnection(config)
+    .then(function(conn) {
+      connResolved = conn;
+      return conn.prepare('select ?-? as ttt, ? as uuu');
+    })
+    .then(function(statement) {
+      return statement.execute([11, 3, 'test']);
+    })
+    .then(function(result) {
+      assert.equal(result[0][0].ttt, 8);
+      assert.equal(result[0][0].uuu, 'test');
+      return connResolved.end();
+    })
+    .catch(function(err) {
+      console.log(err);
+      if (connResolved) {
+        connResolved.end();
+      } else {
+        console.log('Warning: promise rejected before executing prepared statement');
+      }
+    });
+}
+
 function testEventsConnect() {
   var connPromise = createConnection(config).then(function(conn) {
     var events = 0;
@@ -226,6 +251,7 @@ function testEventsPool() {
 testBasic();
 testErrors();
 testObjParams();
+testPrepared();
 testEventsConnect();
 testBasicPool();
 testErrorsPool();