Merge branch 'release/2.1.0'

Author: rusher

.prettierrc

@@ -1,7 +1,7 @@
 {
   "trailingComma": "none",
   "tabWidth": 2,
-  "printWidth":  80,
+  "printWidth":  100,
   "semi": true,
   "singleQuote": true,
   "endOfLine": "lf"

.travis.yml

@@ -45,19 +45,19 @@ matrix:
   - node_js: "11"
     env: DB=build
   - node_js: "6"
-    env: DB=mariadb:10.3 SKIP_LEAK=1
+    env: DB=mariadb:10.4 SKIP_LEAK=1
   - node_js: "8"
-    env: DB=mariadb:10.3
+    env: DB=mariadb:10.4
   - node_js: "10"
-    env: DB=mariadb:10.3
+    env: DB=mariadb:10.4
   - node_js: "11"
-    env: DB=mariadb:10.3
+    env: DB=mariadb:10.4
   - node_js: "11"
-    env: DB=mariadb:10.3 LINT=1
+    env: DB=mariadb:10.4 LINT=1
   - node_js: "11"
-    env: DB=mariadb:10.3 BENCH=1
+    env: DB=mariadb:10.4 BENCH=1
   - node_js: "11"
-    env: DB=mariadb:10.3 MAXSCALE_VERSION=2.2.9 TEST_PORT=4007 TEST_USER=bob TEXT_DATABASE=test2
+    env: DB=mariadb:10.4 MAXSCALE_VERSION=2.2.9 TEST_PORT=4007 TEST_USER=bob TEXT_DATABASE=test2
   - node_js: "11"
     env: DB=mariadb:5.5
   - node_js: "11"
@@ -66,6 +66,8 @@ matrix:
     env: DB=mariadb:10.1
   - node_js: "11"
     env: DB=mariadb:10.2
+  - node_js: "11"
+    env: DB=mariadb:10.3
   - node_js: "11"
     env: DB=mysql:5.5
   - node_js: "11"

.travis/entrypoint/dbinit.sql

@@ -1,7 +1,7 @@
 CREATE USER 'bob'@'%';
 GRANT ALL ON *.* TO 'bob'@'%' with grant option;
 
-CREATE USER 'boby'@'%' identified by 'hey';
+CREATE USER 'boby'@'%' identified by 'heyPassw0@rd';
 GRANT ALL ON *.* TO 'boby'@'%' with grant option;
 
 INSTALL PLUGIN pam SONAME 'auth_pam';

.travis/maxscale/maxscale.cnf

@@ -38,7 +38,7 @@ type=monitor
 module=mariadbmon
 servers=server1
 user=boby
-passwd=hey
+passwd=heyPassw0@rd
 monitor_interval=10000
 
 # Service definitions
@@ -52,34 +52,34 @@ monitor_interval=10000
 
 [Read-OnlyService]
 enable_root_user=1
-version_string=10.3.99-MariaDB-maxScale
+version_string=10.4.99-MariaDB-maxScale
 type=service
 router=readconnroute
 servers=server1
 user=boby
-passwd=hey
+passwd=heyPassw0@rd
 router_options=slave
 localhost_match_wildcard_host=1
 
 [Read-WriteService]
 enable_root_user=1
-version_string=10.3.99-MariaDB-maxScale
+version_string=10.4.99-MariaDB-maxScale
 type=service
 router=readwritesplit
 servers=server1
 user=boby
-passwd=hey
+passwd=heyPassw0@rd
 localhost_match_wildcard_host=1
 
 [WriteService]
 type=service
 router=readconnroute
 servers=server1
 user=boby
-passwd=hey
+passwd=heyPassw0@rd
 router_options=master
 localhost_match_wildcard_host=1
-version_string=10.3.99-MariaDB-maxScale
+version_string=10.4.99-MariaDB-maxScale
 
 
 # This service enables the use of the MaxAdmin interface
@@ -88,7 +88,7 @@ version_string=10.3.99-MariaDB-maxScale
 
 [MaxAdminService]
 enable_root_user=1
-version_string=10.3.99-MariaDB-maxScale
+version_string=10.4.99-MariaDB-maxScale
 type=service
 router=cli
 

.travis/sql/dbinit.sql

@@ -1,7 +1,7 @@
 CREATE USER 'bob'@'%';
 GRANT ALL ON *.* TO 'bob'@'%' with grant option;
 
-CREATE USER 'boby'@'%' identified by 'hey';
+CREATE USER 'boby'@'%' identified by 'heyPassw0@rd';
 GRANT ALL ON *.* TO 'boby'@'%' with grant option;
 
 FLUSH PRIVILEGES;

README.md

@@ -17,7 +17,8 @@ MariaDB and MySQL client, 100% JavaScript, with TypeScript definition, compatibl
 
 ## Why a New Client?
 
-While there are existing MySQL clients that work with MariaDB, (such as the [`mysql`](https://www.npmjs.com/package/mysql) and [`mysql2`](https://www.npmjs.com/package/mysql2) clients), the MariaDB Node.js Connector offers new functionality, like [Insert Streaming](#insert-streaming) and [Pipelining](#pipelining) while making no compromises on performance.
+While there are existing MySQL clients that work with MariaDB, (such as the [`mysql`](https://www.npmjs.com/package/mysql) and [`mysql2`](https://www.npmjs.com/package/mysql2) clients), the MariaDB Node.js Connector offers new functionality, like [Insert Streaming](#insert-streaming), [Pipelining](#pipelining), [ed25519 plugin authentication](https://mariadb.org/history-of-mysql-mariadb-authentication-protocols/) while making no compromises on performance.
+ 
 
 ### Insert Streaming 
 
@@ -132,13 +133,6 @@ The default API is [Promise API](https://github.com/MariaDB/mariadb-connector-no
 
 [Callback API](https://github.com/MariaDB/mariadb-connector-nodejs/blob/master/documentation/callback-api.md) is provided for compatibility with the `mysql` and `mysql2` APIs.
 
-## Road Map 
-
-The Connector remains in development.  Here's a list of features being developed for future releases:
-
-* MariaDB `ed25519` plugin authentication
-* Query Timeouts
-
 
 ## Contributing 
 

appveyor.yml

@@ -12,46 +12,50 @@ environment:
   TEST_LOG_PACKETS: true
   matrix:
 
-    - DB: '10.3.14'
+    - DB: '10.4.6'
       MEM: "21"
       nodejs_version: "6"
       SKIP_LEAK: "1"
 
-    - DB: '10.3.14'
+    - DB: '10.4.6'
       MEM: "21"
       nodejs_version: "8"
 
-    - DB: '10.3.14'
+    - DB: '10.4.6'
       MEM: "21"
       nodejs_version: "10"
 
-    - DB: '10.3.14'
+    - DB: '10.4.6'
       MEM: "21"
       nodejs_version: "11"
 
-    - DB: '10.3.14'
+    - DB: '10.4.6'
       nodejs_version: "10"
       MEM: "21"
       TEST_ZIP: 1
 
-    - DB: '10.3.14'
+    - DB: '10.4.6'
       nodejs_version: "10"
       MEM: "21"
       BENCH: "1"
 
-    - DB: '10.2.23'
+    - DB: '10.3.16'
       MEM: "21"
       nodejs_version: "10"
 
-    - DB: '10.1.38'
+    - DB: '10.2.25'
+      MEM: "21"
+      nodejs_version: "10"
+
+    - DB: '10.1.40'
       MEM: "21"
       nodejs_version: "10"
 
     - DB: '10.0.38'
       MEM: "21"
       nodejs_version: "10"
 
-    - DB: '5.5.63'
+    - DB: '5.5.64'
       MEM: "5"
       nodejs_version: "10"