diff --git a/lib/mysql.js b/lib/mysql.js index 9bfe733..3400e53 100644 --- a/lib/mysql.js +++ b/lib/mysql.js @@ -125,6 +125,19 @@ MySQL.prototype.query = function (sql, callback) { callback && callback(err, result); } + function runQuery(connection) { + connection.query(sql, function (err, data) { + if (debug) { + if (err) { + console.error('Error:', err); + } + console.log('Data:', data); + } + if (log) log(sql, time); + releaseConnectionAndCallback(connection, err, data); + }); + } + client.getConnection(function (err, connection) { if (err) { callback && callback(err); @@ -141,9 +154,7 @@ MySQL.prototype.query = function (sql, callback) { connection.query(q, function (err) { if (!err) { connection.query('USE `' + db + '`', function (err) { - connection.query(sql, function (err, result) { - releaseConnectionAndCallback(connection, err, result); - }); + runQuery(connection); }); } else { releaseConnectionAndCallback(connection, err); @@ -155,29 +166,11 @@ MySQL.prototype.query = function (sql, callback) { return; } } - connection.query(sql, function (err, data) { - if (debug) { - if (err) { - console.error('Error:', err); - } - console.log('Data:', data); - } - if (log) log(sql, time); - releaseConnectionAndCallback(connection, err, data); - }); + runQuery(connection); }); } else { // Bypass USE db - connection.query(sql, function (err, data) { - if (debug) { - if (err) { - console.error('Error:', err); - } - console.log('Data:', data); - } - if (log) log(sql, time); - releaseConnectionAndCallback(connection, err, data); - }); + runQuery(connection); } }); };