mysql2 3.13.0 → 3.14.0

package/lib/pool_cluster.js

@@ -37,6 +37,18 @@ const getMonotonicMilliseconds = function () {
   return Math.floor(ms);
 };
 
+const patternRegExp = function (pattern) {
+  if (pattern instanceof RegExp) {
+    return pattern;
+  }
+
+  const source = pattern
+    .replace(/([.+?^=!:${}()|[\]/\\])/g, '\\$1')
+    .replace(/\*/g, '.*');
+
+  return new RegExp(`^${source}$`);
+};
+
 class PoolNamespace {
   constructor(cluster, pattern, selector) {
     this._cluster = cluster;
@@ -256,20 +268,12 @@ class PoolCluster extends EventEmitter {
     let currentTime = 0;
     let foundNodeIds = this._findCaches[pattern];
 
-    if (typeof this._findCaches[pattern] === 'undefined') {
-      if (pattern === '*') {
-        // all
-        foundNodeIds = this._serviceableNodeIds;
-      } else if (this._serviceableNodeIds.indexOf(pattern) !== -1) {
-        // one
-        foundNodeIds = [pattern];
-      } else {
-        // wild matching
-        const keyword = pattern.substring(pattern.length - 1, 0);
-        foundNodeIds = this._serviceableNodeIds.filter((id) =>
-          id.startsWith(keyword)
-        );
-      }
+    if (foundNodeIds === undefined) {
+      const expression = patternRegExp(pattern);
+
+      foundNodeIds = this._serviceableNodeIds.filter((id) =>
+        id.match(expression)
+      );
     }
 
     this._findCaches[pattern] = foundNodeIds;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mysql2",
-  "version": "3.13.0",
+  "version": "3.14.0",
   "description": "fast mysql driver. Implements core protocol, prepared statements, ssl and compression in native JS",
   "main": "index.js",
   "typings": "typings/mysql/index",