Merge pull request #709 from felixge/domains

Domains support

Author: sidorares

Changes.md

@@ -7,6 +7,7 @@ you spot any mistakes.
 ## HEAD
 
 * internal parser speed improvement #702
+* domains support
 
 ## v2.0.0 (2014-01-09)
 

lib/Connection.js

@@ -19,6 +19,14 @@ function Connection(options) {
   this.state          = "disconnected";
 }
 
+function bindToCurrentDomain(cb) {
+  var domain = process.domain;
+  if (!domain || !cb)
+    return cb;
+  else
+    return domain.bind(cb);
+}
+
 Connection.createQuery = function(sql, values, cb) {
   if (sql instanceof Query) {
     return sql;
@@ -44,7 +52,7 @@ Connection.createQuery = function(sql, values, cb) {
     options.sql    = sql;
     options.values = values;
   }
-  return new Query(options, cb);
+  return new Query(options, bindToCurrentDomain(cb));
 };
 
 Connection.prototype.connect = function(cb) {
@@ -95,7 +103,7 @@ Connection.prototype.changeUser = function(options, cb){
     database      : options.database || this.config.database,
     charsetNumber : charsetNumber,
     currentConfig : this.config
-  }, cb);
+  }, bindToCurrentDomain(cb));
 };
 
 Connection.prototype.beginTransaction = function(cb) {
@@ -142,17 +150,17 @@ Connection.prototype.query = function(sql, values, cb) {
 
 Connection.prototype.ping = function(cb) {
   this._implyConnect();
-  this._protocol.ping(cb);
+  this._protocol.ping(bindToCurrentDomain(cb));
 };
 
 Connection.prototype.statistics = function(cb) {
   this._implyConnect();
-  this._protocol.stats(cb);
+  this._protocol.stats(bindToCurrentDomain(cb));
 };
 
 Connection.prototype.end = function(cb) {
   this._implyConnect();
-  this._protocol.quit(cb);
+  this._protocol.quit(bindToCurrentDomain(cb));
 };
 
 Connection.prototype.destroy = function() {

lib/Pool.js

@@ -19,6 +19,7 @@ function Pool(options) {
 }
 
 Pool.prototype.getConnection = function (cb) {
+
   if (this._closed) {
     return process.nextTick(function(){
       return cb(new Error('Pool is closed.'));
@@ -31,7 +32,7 @@ Pool.prototype.getConnection = function (cb) {
     connection = this._freeConnections.shift();
 
     return process.nextTick(function(){
-      return cb(null, connection);
+      cb(null, connection);
     });
   }
 
@@ -63,6 +64,8 @@ Pool.prototype.getConnection = function (cb) {
     return cb(new Error('Queue limit reached.'));
   }
 
+  if (cb && process.domain)
+    cb = process.domain.bind(cb);
   this._connectionQueue.push(cb);
 };
 
@@ -124,11 +127,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

@@ -0,0 +1,102 @@
+var assert = require('assert');
+var domain = require('domain');
+var d1 = domain.create();
+var d2 = domain.create();
+var d3 = domain.create();
+var d4 = domain.create();
+var d5 = domain.create();
+var d6 = domain.create();
+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({ connectionLimit: 1});
+  var assert     = require('assert');
+ 
+  d2.run(function() {
+    connection.query('SELECT 1', function(err, _rows, _fields) {
+      if (err) throw err;
+      throw new Error('inside domain 2');
+    });
+  });
+    
+  d3.run(function() {
+    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');
+    });
+  });
+
+  d4.run(function() {
+    connection.ping(function() {
+      throw new Error('inside domain 4');
+    });
+  });
+
+  d5.run(function() {
+    connection.statistics(function(err, stat) {
+      throw new Error('inside domain 5');
+    });
+  });
+  
+  d6.run(function() {
+    pool.getConnection(function(err, conn) {
+      conn.release();
+      throw new Error('inside domain 6');
+    });
+  });
+  
+  connection.end();
+  setTimeout(function() {
+    pool.end();
+    throw new Error('inside domain 1');
+  }, 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;
+});
+
+process.on('exit', function() {
+  assert.equal(''+err1, 'Error: inside domain 1')
+  assert.equal(''+err2, 'Error: inside domain 2')
+  assert.equal(''+err3, 'Error: inside domain 3') 
+  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') 
+});