Mysql2 validate connection fix #4794 (#4812)

(cherry picked from commit 89bd0a0)
knex · Nov 8, 2021 · 337178f · 337178f
1 parent 29ac476
commit 337178f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 12 deletions.
diff --git a/lib/dialects/mysql/index.js b/lib/dialects/mysql/index.js
@@ -89,13 +89,9 @@ class Client_MySQL extends Client {
   }
 
   validateConnection(connection) {
-    if (
-      connection.state === 'connected' ||
-      connection.state === 'authenticated'
-    ) {
-      return true;
-    }
-    return false;
+    return (
+      connection.state === 'connected' || connection.state === 'authenticated'
+    );
   }
 
   // Grab a connection, run the query via the MySQL streaming interface,

diff --git a/lib/dialects/mysql2/index.js b/lib/dialects/mysql2/index.js
@@ -15,10 +15,13 @@ class Client_MySQL2 extends Client_MySQL {
     return require('mysql2');
   }
   validateConnection(connection) {
-    if (connection._fatalError) {
-      return false;
-    }
-    return true;
+    return (
+      connection &&
+      !connection._fatalError &&
+      !connection._protocolError &&
+      !connection._closing &&
+      !connection.stream.destroyed
+    );
   }
 }
 

diff --git a/test/tape/pool.js b/test/tape/pool.js
@@ -23,7 +23,7 @@ test(`pool evicts dead resources when factory.validate rejects`, async (t) => {
     },
 
     validate: (res) => {
-      return res.error ? false : true;
+      return !res.error;
     },
 
     destroy: (res) => {