Fix pool cluster wildcard matching

fixes #627

Author: dougwilson

Changes.md

@@ -19,6 +19,7 @@ you spot any mistakes.
 * Fix SSL handshake error to  be catchable #800
 * Add `connection.threadId` to get MySQL connection ID #602
 * Ensure `pool.getConnection` retrieves good connections #434 #557 #778
+* Fix pool cluster wildcard matching #627
 
 ## v2.1.1 (2014-03-13)
 

lib/PoolCluster.js

@@ -103,12 +103,15 @@ PoolCluster.prototype._findNodeIds = function(pattern) {
     foundNodeIds = this._serviceableNodeIds;
   } else  if (this._serviceableNodeIds.indexOf(pattern) != -1) { // one
     foundNodeIds = [pattern];
-  } else { // wild matching
+  } else if (pattern[pattern.length - 1] === '*') {
+    // wild matching
     var keyword = pattern.substring(pattern.length - 1, 0);
 
     foundNodeIds = this._serviceableNodeIds.filter(function (id) {
       return id.indexOf(keyword) === 0;
     });
+  } else {
+    foundNodeIds = [];
   }
 
   this._findCaches[pattern] = foundNodeIds;
@@ -181,7 +184,7 @@ PoolNamespace.prototype.getConnection = function(cb) {
   var clusterNode = this._getClusterNode();
 
   if (clusterNode === null) {
-    return cb(new Error('Pool does Not exists.'));
+    return cb(new Error('Pool does not exist.'));
   }
 
   this._cluster._getConnection(clusterNode, function(err, connection) {

test/unit/pool-cluster/test-pattern.js

@@ -0,0 +1,24 @@
+var assert  = require('assert');
+var common  = require('../../common');
+var cluster = common.createPoolCluster();
+var server  = common.createFakeServer();
+
+var poolConfig = common.getTestConfig({port: common.fakeServerPort});
+cluster.add('MASTER', poolConfig);
+cluster.add('SLAVE' , poolConfig);
+cluster.add('SLAVE1', poolConfig);
+cluster.add('SLAVE2', poolConfig);
+
+server.listen(common.fakeServerPort, function(err) {
+  assert.ifError(err);
+
+  cluster.getConnection('SLAVE4', function(err, conn){
+    assert.ok(err);
+    assert.equal(err.message, 'Pool does not exist.');
+    server.destroy();
+  });
+});
+
+server.on('connection', function(incomingConnection) {
+  incomingConnection.handshake();
+});