Handle Connection#config state for changeUser

felixge · felixge · commit 4a2517bda8f2 · 2012-07-10T19:44:06.000-04:00
This patch makes sure that the Connection#config state is only mutated
once the ChangeUser sequence is starting. Before that the old state is
assumed.
diff --git a/lib/Config.js b/lib/Config.js
@@ -22,7 +22,7 @@ function Config(options) {
 
   this.maxPacketSize = 0;
   this.charsetNumber = (options.charset)
-    ? Charsets[options.charset]
+    ? Config.getCharsetNumber(options.charset)
     : Charsets.UTF8_GENERAL_CI;
 
   this.clientFlags =
@@ -45,6 +45,10 @@ function Config(options) {
   }
 }
 
+Config.getCharsetNumber = function(charset) {
+  return Charsets[charset];
+};
+
 Config.parseUrl = function(url) {
   url = urlParse(url, true);
 
diff --git a/lib/Connection.js b/lib/Connection.js
@@ -36,25 +36,23 @@ Connection.prototype.connect = function(cb) {
   this._protocol.handshake(cb);
 };
 
-Connection.prototype.changeUser = function(config, cb){
-  if (typeof config === 'function') {
-    cb     = config;
-    config = this.config;
-  } else {
-    var newConfig = {};
-
-    for (var prop in this.config) {
-      newConfig[prop] = this.config[prop];
-    }
-
-    for (var prop in config) {
-      newConfig[prop] = config[prop];
-    }
-
-    config = new Config(newConfig);
+Connection.prototype.changeUser = function(options, cb){
+  if (typeof options === 'function') {
+    cb      = options;
+    options = {};
   }
 
-  return this._protocol.changeUser(config, cb);
+  var charsetNumber = (options.charset)
+    ? Config.getCharsetNumber(options.charset)
+    : this.config.charsetNumber;
+
+  return this._protocol.changeUser({
+    user          : options.user || this.config.user,
+    password      : options.password || this.config.password,
+    database      : options.database || this.config.database,
+    charsetNumber : charsetNumber,
+    currentConfig : this.config,
+  }, cb);
 };
 
 Connection.prototype.query = function(sql, values, cb) {
diff --git a/lib/protocol/sequences/ChangeUser.js b/lib/protocol/sequences/ChangeUser.js
@@ -5,24 +5,37 @@ var Auth     = require('../Auth');
 
 module.exports = ChangeUser;
 Util.inherits(ChangeUser, Sequence);
-function ChangeUser(config, callback) {
+function ChangeUser(options, callback) {
   Sequence.call(this, callback);
 
-  this._config = config;
+  this._user          = options.user;
+  this._password      = options.password;
+  this._database      = options.database;
+  this._charsetNumber = options.charsetNumber;
+  this._currentConfig = options.currentConfig;
 }
 
 ChangeUser.prototype.start = function(handshakeInitializationPacket) {
   var scrambleBuff = handshakeInitializationPacket.scrambleBuff();
-  scrambleBuff     = Auth.token(this._config.password, scrambleBuff);
+  scrambleBuff     = Auth.token(this._password, scrambleBuff);
 
   var packet = new Packets.ComChangeUserPacket({
-    user          : this._config.user,
+    user          : this._user,
     scrambleBuff  : scrambleBuff,
-    database      : this._config.database,
-    charsetNumber : this._config.charsetNumber,
+    database      : this._database,
+    charsetNumber : this._charsetNumber,
   });
 
-  this._emitPacket(packet);
+  this._currentConfig.user          = this._user;
+  this._currentConfig.password      = this._password;
+  this._currentConfig.database      = this._database;
+  this._currentConfig.charsetNumber = this._charsetNumber;
+
+  this.emit('packet', packet);
+};
+
+ChangeUser.prototype['OkPacket'] = function(packet) {
+  Sequence.prototype.OkPacket.call(this, packet);
 };
 
 ChangeUser.prototype['ErrorPacket'] = function(packet) {
diff --git a/test/integration/test-change-user.js b/test/integration/test-change-user.js
@@ -11,6 +11,7 @@ connection.query('select database() as db', function(err, results) {
   if (err) throw err;
 
   initialDb = results[0].db;
+  assert.equal(connection.config.database, null);
 });
 
 connection.changeUser({database: common.testDatabase});
@@ -20,6 +21,7 @@ connection.query('select database() as db', function(err, results){
   if (err) throw err;
 
   finalDb = results[0].db;
+  assert.equal(connection.config.database, finalDb);
 });
 
 connection.end();
