[misc] mysql 8 error detection correction

Author: rusher

.travis.yml

@@ -58,7 +58,6 @@ matrix:
     env: DB=mariadb:10.4 BENCH=1 SKIP_LEAK=1
   - node_js: "12"
     env: DB=mariadb:10.4 MAXSCALE_VERSION=2.2.9 TEST_PORT=4007 TEST_USER=bob TEXT_DATABASE=test2 SKIP_LEAK=1
-
   - node_js: "12"
     env: DB=mariadb:10.1 SKIP_LEAK=1
   - node_js: "12"
@@ -70,7 +69,7 @@ matrix:
   - node_js: "12"
     env: DB=mysql:5.7 SKIP_LEAK=1
   - node_js: "12"
-    env: DB=mysql:8.0 SKIP_LEAK=1
+    env: DB=mysql:8.0 SKIP_LEAK=1 ADDITIONAL_CONF=--default-authentication-plugin=mysql_native_password
 
 notifications:
   email: false

test/integration/test-connection-opts.js

@@ -438,7 +438,7 @@ describe('connection option', () => {
         .catch(err => {
           assert.isTrue(
             err.message.includes(
-              'Can only use timeout for MariaDB server after 10.1.1. timeout value:'
+              'Can only use queryTimeout for MariaDB server after 10.1.1. queryTimeout value:'
             )
           );
           assert.equal(err.errno, 45038);

test/integration/test-pool-callback.js

@@ -21,7 +21,11 @@ describe('Pool callback', () => {
             done(new Error('must have thrown error'));
           } else {
             assert.isTrue(
-              err.errno === 1524 || err.errno === 1045 || err.errno === 1698 || err.errno === 45028,
+              err.errno === 1524 ||
+                err.errno === 1045 ||
+                err.errno === 1698 ||
+                err.errno === 45028 ||
+                err.errno === 45025,
               err.message
             );
             pool.end();
@@ -41,7 +45,9 @@ describe('Pool callback', () => {
     this.timeout(10000);
     const pool = base.createPoolCallback({
       connectionLimit: 3,
-      user: 'wrongAuthentication'
+      user: 'wrongAuthentication',
+      acquireTimeout: 4000,
+      initializationTimeout: 2000
     });
     pool.getConnection(err => {
       if (!err) {
@@ -53,8 +59,12 @@ describe('Pool callback', () => {
             done(new Error('must have thrown error'));
           } else {
             assert.isTrue(
-              err.errno === 1524 || err.errno === 1045 || err.errno === 1698 || err.errno === 45028,
-              err.message
+              err.errno === 1524 ||
+                err.errno === 1045 ||
+                err.errno === 1698 ||
+                err.errno === 45028 ||
+                err.errno === 45025,
+              err.errno + ' - ' + err.message
             );
             done();
           }

test/integration/test-pool.js

@@ -85,7 +85,14 @@ describe('Pool', () => {
         done(new Error('must have thrown error'));
       })
       .catch(err => {
-        assert.isTrue(err.errno === 1524 || err.errno === 1045 || err.errno === 1698, err.message);
+        assert.isTrue(
+          err.errno === 1524 ||
+            err.errno === 1045 ||
+            err.errno === 1698 ||
+            err.errno === 45025 ||
+            err.errno === 45028,
+          err.message
+        );
         pool
           .query('SELECT 3')
           .then(() => {
@@ -95,7 +102,11 @@ describe('Pool', () => {
           .catch(err => {
             pool.end();
             assert.isTrue(
-              err.errno === 1524 || err.errno === 1045 || err.errno === 1698 || err.errno === 45028,
+              err.errno === 1524 ||
+                err.errno === 1045 ||
+                err.errno === 1698 ||
+                err.errno === 45028 ||
+                err.errno === 45025,
               err.message
             );
             done();
@@ -108,7 +119,14 @@ describe('Pool', () => {
         done(new Error('must have thrown error'));
       })
       .catch(err => {
-        assert.isTrue(err.errno === 1524 || err.errno === 1045 || err.errno === 1698, err.message);
+        assert.isTrue(
+          err.errno === 1524 ||
+            err.errno === 1045 ||
+            err.errno === 1698 ||
+            err.errno === 45025 ||
+            err.errno === 45028,
+          err.message
+        );
       });
   });
 
@@ -126,7 +144,14 @@ describe('Pool', () => {
         done(new Error('must have thrown error'));
       })
       .catch(err => {
-        assert.isTrue(err.errno === 1524 || err.errno === 1045 || err.errno === 1698, err.message);
+        assert.isTrue(
+          err.errno === 1524 ||
+            err.errno === 1045 ||
+            err.errno === 1698 ||
+            err.errno === 45028 ||
+            err.errno === 45025,
+          err.message
+        );
         pool
           .getConnection()
           .then(() => {
@@ -136,7 +161,11 @@ describe('Pool', () => {
           .catch(err => {
             pool.end();
             assert.isTrue(
-              err.errno === 1524 || err.errno === 1045 || err.errno === 1698 || err.errno === 45028,
+              err.errno === 1524 ||
+                err.errno === 1045 ||
+                err.errno === 1698 ||
+                err.errno === 45028 ||
+                err.errno === 45025,
               err.message
             );
             done();
@@ -149,7 +178,14 @@ describe('Pool', () => {
         done(new Error('must have thrown error'));
       })
       .catch(err => {
-        assert.isTrue(err.errno === 1524 || err.errno === 1045 || err.errno === 1698, err.message);
+        assert.isTrue(
+          err.errno === 1524 ||
+            err.errno === 1045 ||
+            err.errno === 1698 ||
+            err.errno === 45028 ||
+            err.errno === 45025,
+          err.message
+        );
       });
   });