clean up formatting

Author: jafl

benchmarks/bench-insert-select-parallel.js

@@ -18,11 +18,14 @@ connection.query(
 );
 
 function benchmarkInsert(numLeft, callback) {
-  connection.query(`INSERT INTO ${table} SET title="${text}"`, err => {
-    if (err) throw err;
-    if (numLeft > 1) benchmarkInsert(numLeft - 1, callback);
-    else callback();
-  });
+  connection.query(
+    `INSERT INTO ${table} SET title="${text}"`,
+    err => {
+      if (err) throw err;
+      if (numLeft > 1) benchmarkInsert(numLeft - 1, callback);
+      else callback();
+    }
+  );
 }
 
 function benchmarkInserts(n, cb) {
@@ -48,8 +51,7 @@ function benchmarkParallelSelects(n, size, cb) {
     const end = process.hrtime();
     const diff = common.hrdiff(start, end);
     console.log(
-      `${size} rows: ${(n * 1e9) / diff} results/sec, ${(size * n * 1e9) /
-        diff} rows/sec`
+      `${size} rows: ${(n * 1e9) / diff} results/sec, ${(size * n * 1e9) / diff} rows/sec`
     );
     cb();
   }

benchmarks/bench-insert-select-prepared.js

@@ -17,11 +17,15 @@ connection.query(
 );
 
 function benchmarkInsert(numLeft, callback) {
-  connection.execute(`INSERT INTO ${table} SET title="${text}"`, [], err => {
-    if (err) throw err;
-    if (numLeft > 1) benchmarkInsert(numLeft - 1, callback);
-    else callback();
-  });
+  connection.execute(
+    `INSERT INTO ${table} SET title="${text}"`,
+    [],
+    err => {
+      if (err) throw err;
+      if (numLeft > 1) benchmarkInsert(numLeft - 1, callback);
+      else callback();
+    }
+  );
 }
 
 function benchmarkInserts(n, cb) {
@@ -37,11 +41,15 @@ function benchmarkInserts(n, cb) {
 }
 
 function benchmarkSelect(numLeft, numSelect, callback) {
-  connection.execute(`select * from ${table} limit ${numSelect}`, [], err => {
-    if (err) throw err;
-    if (numLeft > 1) benchmarkSelect(numLeft - 1, numSelect, callback);
-    else callback();
-  });
+  connection.execute(
+    `select * from ${table} limit ${numSelect}`,
+    [],
+    err => {
+      if (err) throw err;
+      if (numLeft > 1) benchmarkSelect(numLeft - 1, numSelect, callback);
+      else callback();
+    }
+  );
 }
 
 function benchmarkSelects(n, size, cb) {
@@ -51,10 +59,7 @@ function benchmarkSelects(n, size, cb) {
     const end = process.hrtime();
     const diff = common.hrdiff(start, end);
     console.log(
-      `${size} rows: ${(numSelects * 1e9) / diff} results/sec, ${(size *
-        numSelects *
-        1e9) /
-        diff} rows/sec`
+      `${size} rows: ${(numSelects * 1e9) / diff} results/sec, ${(size * numSelects * 1e9) / diff} rows/sec`
     );
     if (n > 1) benchmarkSelects(n - 1, size, cb);
     else cb();

benchmarks/bench-insert-select.js

@@ -16,11 +16,14 @@ connection.query(
 );
 
 function benchmarkInsert(numLeft, callback) {
-  connection.query(`INSERT INTO ${table} SET title="${text}"`, err => {
-    if (err) throw err;
-    if (numLeft > 1) benchmarkInsert(numLeft - 1, callback);
-    else callback();
-  });
+  connection.query(
+    `INSERT INTO ${table} SET title="${text}"`,
+    err => {
+      if (err) throw err;
+      if (numLeft > 1) benchmarkInsert(numLeft - 1, callback);
+      else callback();
+    }
+  );
 }
 
 function benchmarkInserts(n, cb) {
@@ -50,10 +53,7 @@ function benchmarkSelects(n, size, cb) {
     const end = process.hrtime();
     const diff = common.hrdiff(start, end);
     console.log(
-      `${size} rows: ${(numSelects * 1e9) / diff} results/sec, ${(size *
-        numSelects *
-        1e9) /
-        diff} rows/sec`
+      `${size} rows: ${(numSelects * 1e9) / diff} results/sec, ${(size * numSelects * 1e9) / diff} rows/sec`
     );
     if (n > 1) benchmarkSelects(n - 1, size, cb);
     else cb();

lib/commands/auth_switch.js

@@ -19,11 +19,9 @@ const standardAuthPlugins = {
 };
 
 function warnLegacyAuthSwitch() {
-  /* eslint-disable no-console */
   console.warn(
     'WARNING! authSwitchHandler api is deprecated, please use new authPlugins api'
   );
-  /* eslint-enable no-console */
 }
 
 function authSwitchPluginError(error, command) {

lib/commands/query.js

@@ -120,9 +120,7 @@ class Query extends Command {
     if (connection.config.debug) {
       // eslint-disable-next-line
       console.log(
-        `        Resultset header received, expecting ${
-          rs.fieldCount
-        } column definition packets`
+        `        Resultset header received, expecting ${rs.fieldCount} column definition packets`
       );
     }
     if (this._fieldCount === 0) {

lib/connection.js

@@ -299,19 +299,11 @@ class Connection extends EventEmitter {
       if (this.config.debug) {
         // eslint-disable-next-line no-console
         console.log(
-          `${this._internalId} ${this.connectionId} <== ${
-            this._command._commandName
-          }#${this._command.stateName()}(${[
-            this.sequenceId,
-            packet._name,
-            packet.length()
-          ].join(',')})`
+          `${this._internalId} ${this.connectionId} <== ${this._command._commandName}#${this._command.stateName()}(${[this.sequenceId, packet._name, packet.length()].join(',')})`
         );
         // eslint-disable-next-line no-console
         console.log(
-          `${this._internalId} ${
-            this.connectionId
-          } <== ${packet.buffer.toString('hex')}`
+          `${this._internalId} ${this.connectionId} <== ${packet.buffer.toString('hex')}`
         );
       }
       this._bumpSequenceId(1);
@@ -320,19 +312,11 @@ class Connection extends EventEmitter {
       if (this.config.debug) {
         // eslint-disable-next-line no-console
         console.log(
-          `${this._internalId} ${
-            this.connectionId
-          } <== Writing large packet, raw content not written:`
+          `${this._internalId} ${this.connectionId} <== Writing large packet, raw content not written:`
         );
         // eslint-disable-next-line no-console
         console.log(
-          `${this._internalId} ${this.connectionId} <== ${
-            this._command._commandName
-          }#${this._command.stateName()}(${[
-            this.sequenceId,
-            packet._name,
-            packet.length()
-          ].join(',')})`
+          `${this._internalId} ${this.connectionId} <== ${this._command._commandName}#${this._command.stateName()}(${[this.sequenceId, packet._name, packet.length()].join(',')})`
         );
       }
       for (offset = 4; offset < 4 + length; offset += MAX_PACKET_LENGTH) {
@@ -441,9 +425,7 @@ class Connection extends EventEmitter {
       if (packet) {
         // eslint-disable-next-line no-console
         console.log(
-          ` raw: ${packet.buffer
-            .slice(packet.offset, packet.offset + packet.length())
-            .toString('hex')}`
+          ` raw: ${packet.buffer.slice(packet.offset, packet.offset + packet.length()).toString('hex')}`
         );
         // eslint-disable-next-line no-console
         console.trace();
@@ -455,13 +437,7 @@ class Connection extends EventEmitter {
           : '(no command)';
         // eslint-disable-next-line no-console
         console.log(
-          `${this._internalId} ${
-            this.connectionId
-          } ==> ${commandName}#${stateName}(${[
-            packet.sequenceId,
-            packet.type(),
-            packet.length()
-          ].join(',')})`
+          `${this._internalId} ${this.connectionId} ==> ${commandName}#${stateName}(${[packet.sequenceId, packet.type(), packet.length()].join(',')})`
         );
       }
     }
@@ -597,9 +573,7 @@ class Connection extends EventEmitter {
       cmdQuery.values !== undefined ? cmdQuery.values : []
     );
     cmdQuery.sql = rawSql;
-    // eslint-disable-next-line consistent-this, no-invalid-this
-    const self = this;
-    cmdQuery.once('end', () => self.emit('done'));
+    cmdQuery.once('end', () => this.emit('done'));
     return this.addCommand(cmdQuery);
   }
 
@@ -720,9 +694,7 @@ class Connection extends EventEmitter {
     });
     this.addCommand(prepareCommand);
     this.addCommand(executeCommand);
-    // eslint-disable-next-line consistent-this, no-invalid-this
-    const self = this;
-    executeCommand.once('end', () => self.emit('done'));
+    executeCommand.once('end', () => this.emit('done'));
     return executeCommand;
   }
 
@@ -970,9 +942,7 @@ class Connection extends EventEmitter {
   }
 
   static statementKey(options) {
-    return `${typeof options.nestTables}/${options.nestTables}/${
-      options.rowsAsArray
-    }${options.sql}`;
+    return `${typeof options.nestTables}/${options.nestTables}/${options.rowsAsArray}${options.sql}`;
   }
 }
 

lib/connection_config.js

@@ -127,9 +127,7 @@ class ConnectionConfig {
       // https://github.com/mysqljs/mysql#user-content-connection-options
       // eslint-disable-next-line no-console
       console.error(
-        `Ignoring invalid timezone passed to Connection: ${
-          options.timezone
-        }. This is currently a warning, but in future versions of MySQL2, an error will be thrown if you pass an invalid configuration option to a Connection`
+        `Ignoring invalid timezone passed to Connection: ${options.timezone}. This is currently a warning, but in future versions of MySQL2, an error will be thrown if you pass an invalid configuration option to a Connection`
       );
       // SqlStrings falls back to UTC on invalid timezone
       this.timezone = 'Z';

lib/pool.js

@@ -143,8 +143,9 @@ class Pool extends EventEmitter {
         return;
       }
       try {
-        conn.query(cmdQuery);
-        conn.once('done', () => conn.release());
+        conn.query(cmdQuery).once('end', () => {
+          conn.release();
+        });
       } catch (e) {
         conn.release();
         throw e;
@@ -178,8 +179,9 @@ class Pool extends EventEmitter {
         return cb(err);
       }
       try {
-        conn.execute(sql, values, cb);
-        conn.once('done', () => conn.release());
+        conn.execute(sql, values, cb).once('end', () => {
+          conn.release();
+        });
       } catch (e) {
         conn.release();
         return cb(e);

lib/pool_cluster.js

@@ -182,10 +182,10 @@ class PoolCluster extends EventEmitter {
       callback !== undefined
         ? callback
         : err => {
-            if (err /* eslint-disable-line */) {
-              throw err; /* eslint-disable-line */
-            } /* eslint-disable-line */
-          }; /* eslint-disable-line */
+            if (err) {
+              throw err;
+            }
+          };
     if (this._closed) {
       process.nextTick(cb);
       return;

lib/results_stream.js

@@ -5,12 +5,14 @@ const Readable = require('stream').Readable;
 // copy-paste from https://github.com/mysqljs/mysql/blob/master/lib/protocol/sequences/Query.js
 module.exports = function(command, connectionStream) {
   command.stream = function(options) {
+    let stream;
+
     options = options || {};
     options.objectMode = true;
-    const stream = new Readable(options);
-    stream._read = function() {
+    (stream = new Readable(options)),
+    (stream._read = function() {
       connectionStream.resume();
-    };
+    });
 
     this.on('result', (row, i) => {
       if (!stream.push(row)) {

promise.js

@@ -370,11 +370,11 @@ class PromisePool extends EventEmitter {
         'Callback function is not available with promise clients.'
       );
     }
-    return this.getConnection().then(async conn => {
+    return this.getConnection().then(conn => {
       try {
         const promise = conn.query(sql, args);
         conn.once('done', () => conn.release());
-        return await promise;
+        return promise;
       } catch (e) {
         conn.release();
         throw e;
@@ -388,11 +388,11 @@ class PromisePool extends EventEmitter {
         'Callback function is not available with promise clients.'
       );
     }
-    return this.getConnection().then(async conn => {
+    return this.getConnection().then(conn => {
       try {
         const promise = conn.execute(sql, args);
         conn.once('done', () => conn.release());
-        return await promise;
+        return promise;
       } catch (e) {
         conn.release();
         throw e;