From 10d2ca7239e5785a2fd1a0a416fd7d5bf0df816d Mon Sep 17 00:00:00 2001 From: Patrick Walker Date: Wed, 14 Aug 2019 15:59:57 +0100 Subject: [PATCH 1/2] psuedo connection check --- lib/connectionHandler.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/connectionHandler.js b/lib/connectionHandler.js index 8ae4a45..261fcd6 100644 --- a/lib/connectionHandler.js +++ b/lib/connectionHandler.js @@ -30,10 +30,14 @@ const connectionHandler = async (connection) => { if ((typeof connection === 'object') && (!(connection instanceof Connection) && !(connection instanceof Pool))) { debug('creating connection from object:', connection); - if (connection.isPool) { - connection = mysql.createPool(connection); + if (connection.config) { + connection = mysql.createConnection(connection.config); } else { - connection = mysql.createConnection(connection); + if (connection.isPool) { + connection = mysql.createPool(connection); + } else { + connection = mysql.createConnection(connection); + } } } From fc668f114ea439ab25b2b495bab5253b8b98c377 Mon Sep 17 00:00:00 2001 From: Patrick Walker Date: Wed, 14 Aug 2019 16:39:56 +0100 Subject: [PATCH 2/2] eslint fixes --- lib/connectionHandler.js | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/lib/connectionHandler.js b/lib/connectionHandler.js index 261fcd6..f421848 100644 --- a/lib/connectionHandler.js +++ b/lib/connectionHandler.js @@ -32,12 +32,10 @@ const connectionHandler = async (connection) => { debug('creating connection from object:', connection); if (connection.config) { connection = mysql.createConnection(connection.config); + } else if (connection.isPool) { + connection = mysql.createPool(connection); } else { - if (connection.isPool) { - connection = mysql.createPool(connection); - } else { - connection = mysql.createConnection(connection); - } + connection = mysql.createConnection(connection); } }