mysql2 3.14.5 → 3.14.6-canary.e72247f7

package/lib/base/pool.js

@@ -200,7 +200,11 @@ class BasePool extends EventEmitter {
             Date.now() - this._freeConnections.get(0).lastActiveTime >
               this.config.idleTimeout)
         ) {
-          this._freeConnections.get(0).destroy();
+          if (this.config.connectionConfig.gracefulEnd) {
+            this._freeConnections.get(0).end();
+          } else {
+            this._freeConnections.get(0).destroy();
+          }
         }
       } finally {
         this._removeIdleTimeoutConnections();

package/lib/base/pool_connection.js

@@ -30,6 +30,13 @@ class BasePoolConnection extends BaseConnection {
   }
 
   end() {
+    if (this.config.gracefulEnd) {
+      this._removeFromPool();
+      super.end();
+
+      return;
+    }
+
     const err = new Error(
       'Calling conn.end() to release a pooled connection is ' +
         'deprecated. In next version calling conn.end() will be ' +

package/lib/connection_config.js

@@ -68,6 +68,7 @@ const validOptions = {
   queueLimit: 1,
   waitForConnections: 1,
   jsonStrings: 1,
+  gracefulEnd: 1,
 };
 
 class ConnectionConfig {
@@ -190,6 +191,7 @@ class ConnectionConfig {
     };
     this.maxPreparedStatements = options.maxPreparedStatements || 16000;
     this.jsonStrings = options.jsonStrings || false;
+    this.gracefulEnd = options.gracefulEnd || false;
   }
 
   static mergeFlags(default_flags, user_flags) {

package/package.json

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

package/typings/mysql/lib/Connection.d.ts

@@ -335,6 +335,8 @@ export interface ConnectionOptions {
    * (Default: false)
    */
   jsonStrings?: boolean;
+
+  gracefulEnd?: boolean;
 }
 
 declare class Connection extends QueryableBase(ExecutableBase(EventEmitter)) {