domains support in pool

Author: sidorares

lib/Pool.js

@@ -19,6 +19,10 @@ function Pool(options) {
 }
 
 Pool.prototype.getConnection = function (cb) {
+
+  if (cb && process.domain)
+    cb = process.domain.bind(cb);
+
   if (this._closed) {
     return process.nextTick(function(){
       return cb(new Error('Pool is closed.'));
@@ -31,7 +35,7 @@ Pool.prototype.getConnection = function (cb) {
     connection = this._freeConnections.shift();
 
     return process.nextTick(function(){
-      return cb(null, connection);
+      cb(null, connection);
     });
   }
 
@@ -124,11 +128,11 @@ Pool.prototype.query = function (sql, values, cb) {
     cb = values;
     values = null;
   }
-
+  
   this.getConnection(function (err, conn) {
     if (err) return cb(err);
 
-    conn.query(sql, values, function () {
+    conn.query(sql, values, function (err, rows, fields) {
       conn.release();
       cb.apply(this, arguments);
     });

test/integration/connection/test-domains.js

@@ -6,12 +6,13 @@ var d3 = domain.create();
 var d4 = domain.create();
 var d5 = domain.create();
 var d6 = domain.create();
-var err1, err2, err3, err4, err5, err6;
+var d7 = domain.create();
+var err1, err2, err3, err4, err5, err6, err7;
 
 d1.run(function() {
   var common     = require('../../common');
   var connection = common.createConnection();
-  var pool       = common.createPool();
+  var pool       = common.createPool({ connectionLimit: 1});
   var assert     = require('assert');
 
   d2.run(function() {
@@ -20,10 +21,16 @@ d1.run(function() {
       throw new Error('inside domain 2');
     });
   });
-
+    
   d3.run(function() {
-    pool.query('SELECT 2', function(err, _rows, _fields) {
-      if (err) throw err;
+    pool.getConnection(function(err, conn) {
+      d7.run(function() {
+        pool.query('SELECT 2', function(err, _rows, _fields) {
+          if (err) throw err;
+          throw new Error('inside domain 7');
+        });
+      });
+      conn.release();
       throw new Error('inside domain 3');
     });
   });
@@ -54,23 +61,33 @@ d1.run(function() {
   }, 100);
 
   d2.on('error', function(err) {
+    assert.equal(''+err, 'Error: inside domain 2') 
     err2 = err;
   });
   d3.on('error', function(err) {
+    assert.equal(''+err, 'Error: inside domain 3') 
     err3 = err;
   });
   d4.on('error', function(err) {
+    assert.equal(''+err, 'Error: inside domain 4') 
     err4 = err;
   });
   d5.on('error', function(err) {
+    assert.equal(''+err, 'Error: inside domain 5') 
     err5 = err;
   });
   d6.on('error', function(err) {
+    assert.equal(''+err, 'Error: inside domain 6') 
     err6 = err;
   });
+  d7.on('error', function(err) {
+    assert.equal(''+err, 'Error: inside domain 7') 
+    err7 = err;
+  });
 });
 
 d1.on('error', function(err) {
+  assert.equal(''+err, 'Error: inside domain 1');
   err1 = err;
 });
 
@@ -81,4 +98,5 @@ process.on('exit', function() {
   assert.equal(''+err4, 'Error: inside domain 4') 
   assert.equal(''+err5, 'Error: inside domain 5') 
   assert.equal(''+err6, 'Error: inside domain 6') 
+  assert.equal(''+err7, 'Error: inside domain 7') 
 });