Fix reconnect

Now one can reconnect a client that has been disconnected using `.end()`.
mysqljs · Oct 12, 2010 · 2db5bbd · 2db5bbd
1 parent 4f0f096
commit 2db5bbd
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 0 deletions.
diff --git a/lib/mysql/client.js b/lib/mysql/client.js
@@ -187,6 +187,8 @@ Client.prototype.end = function(cb) {
     if (cb) {
       self._connection.on('end', cb);
     }
+
+    self._dequeue();
   });
 };
 

diff --git a/test/simple/test-client.js b/test/simple/test-client.js
@@ -374,6 +374,8 @@ test(function end() {
         assert.equal(event, 'end');
         assert.strictEqual(fn, CB);
       });
+
+      gently.expect(client, '_dequeue');
     });
     fn();
   });

diff --git a/test/system/test-client-reconnect.js b/test/system/test-client-reconnect.js
@@ -0,0 +1,18 @@
+require('../common');
+var Client = require('mysql').Client,
+    gently = new Gently(),
+    client = new Client(TEST_CONFIG);
+
+client.connect(gently.expect(function connectCb(err, result) {
+  assert.ifError(err);
+}));
+
+client.end(gently.expect(function endCb() {
+}));
+
+client.connect(gently.expect(function connectCb2(err, result) {
+  assert.ifError(err);
+
+  client.end();
+}));
+