eslint: Update to v4 and fix indentation errors

Author: nwoltman

lib/Connection.js

@@ -10,27 +10,27 @@ const Connection = require('mysql/lib/Connection');
  *   passed to {@link PoolPlus~transactionHandler|`transactionHandler`}.
  */
 
- /**
-  * The same as the `query` method except when not passed a callback it returns
-  * a promise that resolves with the results of the query.
-  *
-  * @param {string|Object} sql - An SqlString or options object.
-  * @param {Array} [values] - Values to replace placeholders in the SqlString.
-  * @param {module:mysql-plus~queryCallback} [cb] - An optional callback that gets called with
-  *     the results of the query.
-  * @return {?Promise} If the `cb` parameter is omitted, a promise that will resolve with the results
-  *     of the query is returned.
-  * @see {@link https://github.com/mysqljs/mysql#performing-queries}
-  *
-  * @example
-  * connection.pquery('SELECT * FROM `books` WHERE `author` = "David"')
-  *   .then((results) => {
-  *     // results will contain the results of the query
-  *   })
-  *   .catch((error) => {
-  *     // error will be the Error that occurred during the query
-  *   });
-  */
+/**
+ * The same as the `query` method except when not passed a callback it returns
+ * a promise that resolves with the results of the query.
+ *
+ * @param {string|Object} sql - An SqlString or options object.
+ * @param {Array} [values] - Values to replace placeholders in the SqlString.
+ * @param {module:mysql-plus~queryCallback} [cb] - An optional callback that gets called with
+ *     the results of the query.
+ * @return {?Promise} If the `cb` parameter is omitted, a promise that will resolve with the results
+ *     of the query is returned.
+ * @see {@link https://github.com/mysqljs/mysql#performing-queries}
+ *
+ * @example
+ * connection.pquery('SELECT * FROM `books` WHERE `author` = "David"')
+ *   .then((results) => {
+ *     // results will contain the results of the query
+ *   })
+ *   .catch((error) => {
+ *     // error will be the Error that occurred during the query
+ *   });
+ */
 Connection.prototype.pquery = function pquery(sql, values, cb) {
   if (typeof (cb || values || sql) === 'function') {
     return this.query(sql, values, cb);

lib/MySQLTable.js

@@ -101,33 +101,33 @@ class MySQLTable {
     );
   }
 
- /**
-  * Checks if rows in the table exist.
-  *
-  * @param {string} sqlString - SQL that specifies rows to check for existence.<br>
-  *     The first example shows how this parameter is used in the query.
-  * @param {Array} [values] - Values to replace the placeholders in `sqlString`.
-  * @param {module:mysql-plus~queryCallback} [cb] - A callback that gets called with
-  *     the results of the query where the `results` will be either `true` or `false`.
-  * @returns {?Promise} If the `cb` parameter is omitted, a promise that will
-  *     resolve with either `true` or `false` is returned.
-  *
-  * @example <caption>Using a promise</caption>
-  * userTable.exists('WHERE `id` > 10')
-  *   .then(exists => console.log(exists)); // true or false
-  *
-  * // SELECT EXISTS (
-  * //   SELECT 1 FROM `user`
-  * //   WHERE `id` > 10  # This is where `sqlString` gets inserted
-  * //   LIMIT 1
-  * // )
-  *
-  * @example <caption>Using a callback and the `values` argument</caption>
-  * userTable.exists('WHERE `id` = ?', [10], (err, exists) => {
-  *   if (err) throw err;
-  *   console.log(exists); // true or false
-  * });
-  */
+  /**
+   * Checks if rows in the table exist.
+   *
+   * @param {string} sqlString - SQL that specifies rows to check for existence.<br>
+   *     The first example shows how this parameter is used in the query.
+   * @param {Array} [values] - Values to replace the placeholders in `sqlString`.
+   * @param {module:mysql-plus~queryCallback} [cb] - A callback that gets called with
+   *     the results of the query where the `results` will be either `true` or `false`.
+   * @returns {?Promise} If the `cb` parameter is omitted, a promise that will
+   *     resolve with either `true` or `false` is returned.
+   *
+   * @example <caption>Using a promise</caption>
+   * userTable.exists('WHERE `id` > 10')
+   *   .then(exists => console.log(exists)); // true or false
+   *
+   * // SELECT EXISTS (
+   * //   SELECT 1 FROM `user`
+   * //   WHERE `id` > 10  # This is where `sqlString` gets inserted
+   * //   LIMIT 1
+   * // )
+   *
+   * @example <caption>Using a callback and the `values` argument</caption>
+   * userTable.exists('WHERE `id` = ?', [10], (err, exists) => {
+   *   if (err) throw err;
+   *   console.log(exists); // true or false
+   * });
+   */
   exists(sqlString, values, cb) {
     if (typeof values === 'function') {
       cb = values;

lib/PoolPlus.js

@@ -108,25 +108,25 @@ class PoolPlus extends Pool {
     return new MySQLTable(name, schema, this);
   }
 
- /**
-  * Syncs the defined tables to the database by creating new tables and dropping
-  * or migrating existing tables (depending on the migration setting).
-  *
-  * Generally, this should only be called once when starting up a server.
-  *
-  * __Warning:__ If an error occurs while syncing, the database will be in an unknown state.
-  * Always keep a backup of your database so you can restore it to the latest working state.
-  *
-  * @param {function} cb - A callback that is called once all defined table schemas have been synced to the
-  *     database. If an error occured, the first argument passed to the callback will be the error object.
-  * @returns {void}
-  *
-  * @example
-  * pool.sync((err) => {
-  *   if (err) throw err;
-  *   // Now do something such as start an HTTP server
-  * });
-  */
+  /**
+   * Syncs the defined tables to the database by creating new tables and dropping
+   * or migrating existing tables (depending on the migration setting).
+   *
+   * Generally, this should only be called once when starting up a server.
+   *
+   * __Warning:__ If an error occurs while syncing, the database will be in an unknown state.
+   * Always keep a backup of your database so you can restore it to the latest working state.
+   *
+   * @param {function} cb - A callback that is called once all defined table schemas have been synced to the
+   *     database. If an error occured, the first argument passed to the callback will be the error object.
+   * @returns {void}
+   *
+   * @example
+   * pool.sync((err) => {
+   *   if (err) throw err;
+   *   // Now do something such as start an HTTP server
+   * });
+   */
   sync(cb) {
     var tablesRemaining = this._tables.size;
     if (!tablesRemaining) {

lib/TableDefinition.js

@@ -106,7 +106,7 @@ class TableDefinition {
       alterOperations.sort(Operation.sorter);
       operations.push(Operation.create(
         Operation.Types.ALTER_TABLE,
-       'ALTER TABLE ' + this._escapedName + spacer + alterOperations.map(op => op.sql).join(',' + spacer)
+        'ALTER TABLE ' + this._escapedName + spacer + alterOperations.map(op => op.sql).join(',' + spacer)
       ));
     }
 

package.json

@@ -23,10 +23,10 @@
   "devDependencies": {
     "coveralls": "^2.11.6",
     "es6-callback-manager": "^2.0.0",
-    "eslint": "^3.15.0",
+    "eslint": "^4.1.1",
     "grunt": "^1.0.1",
     "grunt-env": "^0.4.4",
-    "grunt-eslint": "^19.0.0",
+    "grunt-eslint": "^20.0.0",
     "grunt-jsdoc-to-markdown": "^3.0.0",
     "grunt-mocha-istanbul": "^5.0.1",
     "grunt-mocha-test": "^0.13.2",

test/unit/PoolPlus.test.js

@@ -309,17 +309,15 @@ describe('PoolPlus', () => {
               trxnDone(null, 'success!');
             });
           });
-        })
-        .then(result => {
+        }).then(result => {
           result.should.equal('success!');
           return pool.pquery('SELECT * from mysql_plus_transaction_test')
             .then(rows => {
               rows.should.have.length(1);
               rows[0].id.should.equal(2);
               done();
             });
-        })
-        .catch(done);
+        }).catch(done);
       });
 
       it('should rollback changes if an errors occur', done => {
@@ -343,20 +341,17 @@ describe('PoolPlus', () => {
               trxnDone(null, 'success!');
             });
           });
-        })
-        .then(result => {
+        }).then(result => {
           done(new Error(result));
-        })
-        .catch(err => {
+        }).catch(err => {
           err.code.should.equal('ER_BAD_FIELD_ERROR');
           return pool.pquery('SELECT * from mysql_plus_transaction_test')
             .then(rows => {
               rows.should.have.length(1);
               rows[0].id.should.equal(2);
               done();
             });
-        })
-        .catch(done);
+        }).catch(done);
       });
 
     });
@@ -379,8 +374,7 @@ describe('PoolPlus', () => {
               result.affectedRows.should.equal(1);
               return 'success!';
             });
-        })
-        .then(result => {
+        }).then(result => {
           result.should.equal('success!');
           return pool.pquery('SELECT * FROM mysql_plus_transaction_test')
             .then(rows => {
@@ -401,11 +395,9 @@ describe('PoolPlus', () => {
               result.affectedRows.should.equal(1);
               return 'success!';
             });
-        })
-        .then(result => {
+        }).then(result => {
           throw new Error(result);
-        })
-        .catch(err => {
+        }).catch(err => {
           err.code.should.equal('ER_BAD_FIELD_ERROR');
           return pool.pquery('SELECT * FROM mysql_plus_transaction_test')
             .then(rows => {
@@ -501,20 +493,17 @@ describe('PoolPlus', () => {
         it('should reject with an error', done => {
           pool.transaction(trxn => {
             return trxn.pquery('INSERT INTO mysql_plus_transaction_test VALUES (3)');
-          })
-          .then(result => {
+          }).then(result => {
             done(new Error(result));
-          })
-          .catch(err => {
+          }).catch(err => {
             err.should.equal(error);
             return pool.pquery('SELECT * FROM mysql_plus_transaction_test')
               .then(rows => {
                 rows.should.have.length(1);
                 rows[0].id.should.equal(2);
                 done();
               });
-          })
-          .catch(done);
+          }).catch(done);
         });
 
       });