add prettier and wait for db to go live before starting tests

Author: sidorares

.eslintrc

@@ -1,114 +1,15 @@
 {
+  "extends": [
+    "prettier"
+  ],
+      "parserOptions": {
+        "ecmaVersion": 7,
+      },
   "plugins": [
-      "markdown"
+      "markdown",
+      "async-await"
   ],
   "env": {
     "node": true
-  },
-  "rules": {
-    "array-bracket-spacing": [
-      2,
-      "never"
-    ],
-    "block-spacing": [
-      2,
-      "always"
-    ],
-    "comma-dangle": [
-      2,
-      "never"
-    ],
-    "comma-spacing": [
-      2,
-      {
-        "after": true,
-        "before": false
-      }
-    ],
-    "computed-property-spacing": [
-      2,
-      "never"
-    ],
-    "consistent-return": 2,
-    "curly": 2,
-    "eol-last": 2,
-    "indent": [
-      2,
-      2
-    ],
-    "keyword-spacing": [
-      2,
-      {
-        "after": true,
-        "before": true
-      }
-    ],
-    "linebreak-style": [
-      2,
-      "unix"
-    ],
-    "no-cond-assign": 2,
-    "no-constant-condition": 2,
-    "no-control-regex": 2,
-    "no-debugger": 2,
-    "no-dupe-args": 2,
-    "no-dupe-keys": 2,
-    "no-duplicate-case": 2,
-    "no-empty": 2,
-    "no-empty-character-class": 2,
-    "no-ex-assign": 2,
-    "no-extra-boolean-cast": 2,
-    "no-extra-semi": 2,
-    "no-func-assign": 2,
-    "no-inner-declarations": 2,
-    "no-invalid-regexp": 2,
-    "no-irregular-whitespace": 2,
-    "no-mixed-spaces-and-tabs": 2,
-    "no-multi-spaces": 2,
-    "no-negated-in-lhs": 2,
-    "no-obj-calls": 2,
-    "no-regex-spaces": 2,
-    "no-spaced-func": 2,
-    "no-sparse-arrays": 2,
-    "no-trailing-spaces": 2,
-    "no-unexpected-multiline": 2,
-    "no-unreachable": 2,
-    "no-whitespace-before-property": 2,
-    "object-curly-spacing": 2,
-    "quotes": [
-      2,
-      "single"
-    ],
-    "semi": [
-      2,
-      "always"
-    ],
-    "space-before-blocks": [
-      2,
-      "always"
-    ],
-    "space-before-function-paren": [
-      2,
-      "always"
-    ],
-    "space-in-parens": [
-      2,
-      "never"
-    ],
-    "space-infix-ops": 2,
-    "space-unary-ops": [
-      2,
-      {
-        "nonwords": false,
-        "words": true
-      }
-    ],
-    "spaced-comment": [
-      2,
-      "always"
-    ],
-    "use-isnan": 2,
-    "valid-jsdoc": 1,
-    "valid-typeof": 2
   }
 }

.travis.yml

@@ -7,11 +7,11 @@ services:
 language: node_js
 matrix:
   include:
-  - node_js: "4.7"
+  - node_js: "4.8"
     env: LINT=0
-  - node_js: "6.9"
+  - node_js: "6.10"
     env: LINT=0
-  - node_js: "7.4"
+  - node_js: "7.10"
     env: LINT=1
 
 cache:
@@ -25,7 +25,7 @@ notifications:
 
 script:
   - docker run -d --name mysql -e MYSQL_ALLOW_EMPTY_PASSWORD=1 -e MYSQL_DATABASE=test -p 33306:3306 mysql:5.7
-  - docker run --link mysql:db -e CHECK_PORT=3306 -e CHECK_HOST=db giorgos/takis
+  - MYSQL_PORT=33306 node tools/wait-up.js
   - node --version
   - yarn --version
   - if [ "$LINT" = "1" ]; then yarn run lint; fi

README.md

@@ -53,21 +53,32 @@ npm install --save mysql2
 
 ```js
 // get the client
-var mysql = require('mysql2');
+const mysql = require('mysql2');
 
 // create the connection to database
-var connection = mysql.createConnection({host:'localhost', user: 'root', database: 'test'});
+const connection = mysql.createConnection({
+  host: 'localhost',
+  user: 'root',
+  database: 'test'
+});
 
 // simple query
-connection.query('SELECT * FROM `table` WHERE `name` = "Page" AND `age` > 45', function (err, results, fields) {
-  console.log(results); // results contains rows returned by server
-  console.log(fields); // fields contains extra meta data about results, if available
-});
+connection.query(
+  'SELECT * FROM `table` WHERE `name` = "Page" AND `age` > 45',
+  function(err, results, fields) {
+    console.log(results); // results contains rows returned by server
+    console.log(fields); // fields contains extra meta data about results, if available
+  }
+);
 
 // with placeholder
-connection.query('SELECT * FROM `table` WHERE `name` = ? AND `age` > ?', ['Page', 45], function (err, results) {
-  console.log(results);
-});
+connection.query(
+  'SELECT * FROM `table` WHERE `name` = ? AND `age` > ?',
+  ['Page', 45],
+  function(err, results) {
+    console.log(results);
+  }
+);
 ```
 
 ## Using Prepared Statements
@@ -80,51 +91,59 @@ MySQL provides `execute` helper which will prepare and query the statement. You
 
 ```js
 // get the client
-var mysql = require('mysql2');
+const mysql = require('mysql2');
 
 // create the connection to database
-var connection = mysql.createConnection({host:'localhost', user: 'root', database: 'test'});
+const connection = mysql.createConnection({
+  host: 'localhost',
+  user: 'root',
+  database: 'test'
+});
 
 // execute will internally call prepare and query
-connection.execute('SELECT * FROM `table` WHERE `name` = ? AND `age` > ?', ['Rick C-137', 53], function (err, results, fields) {
-  console.log(results); // results contains rows returned by server
-  console.log(fields); // fields contains extra meta data about results, if available
-
-  // If you execute same statement again, it will be picked form a LRU cache
-  // which will save query preparation time and give better performance
-});
+connection.execute(
+  'SELECT * FROM `table` WHERE `name` = ? AND `age` > ?',
+  ['Rick C-137', 53],
+  function(err, results, fields) {
+    console.log(results); // results contains rows returned by server
+    console.log(fields); // fields contains extra meta data about results, if available
+
+    // If you execute same statement again, it will be picked form a LRU cache
+    // which will save query preparation time and give better performance
+  }
+);
 ```
 ## Using Promise Wrapper
 
 MySQL2 also support Promise API. Which works very well with ES7 async await.
 
 <!--eslint-disable-next-block-->
 ```js
-// get the client
-let mysql = require('mysql2/promise');
-
-// create the connection
-let connection = await mysql.createConnection({host:'localhost', user: 'root', database: 'test'});
-
-// query database
-let [rows, fields] = await connection.execute('SELECT * FROM `table` WHERE `name` = ? AND `age` > ?', ['Morty', 14]);
+async function main() {
+  // get the client
+  const  mysql = require('mysql2/promise');
+  // create the connection
+  const connection = await mysql.createConnection({host:'localhost', user: 'root', database: 'test'});
+  // query database
+  const [rows, fields] = await connection.execute('SELECT * FROM `table` WHERE `name` = ? AND `age` > ?', ['Morty', 14]);
+}
 ```
 
 MySQL2 use default `Promise` object available in scope. But you can choose which `Promise` implementation you want to use
 
 <!--eslint-disable-next-block-->
 ```js
 // get the client
-let mysql = require('mysql2/promise');
+const mysql = require('mysql2/promise');
 
 // get the promise implementation, we will use bluebird
-let bluebird = require('bluebird');
+const bluebird = require('bluebird');
 
 // create the connection, specify bluebird as Promise
-let connection = await mysql.createConnection({host:'localhost', user: 'root', database: 'test', Promise: bluebird});
+const connection =  mysql.createConnection({host:'localhost', user: 'root', database: 'test', Promise: bluebird});
 
 // query database
-let [rows, fields] = await connection.execute('SELECT * FROM `table` WHERE `name` = ? AND `age` > ?', ['Morty', 14]);
+const [rows, fields] =  connection.execute('SELECT * FROM `table` WHERE `name` = ? AND `age` > ?', ['Morty', 14]);
 ```
 
 ## API and Configuration

appveyor.yml

@@ -7,8 +7,8 @@ environment:
   LINT: 0
 
   matrix:
-    - nodejs_version: "6.9"
-    - nodejs_version: "7.3"
+    - nodejs_version: "6.10"
+    - nodejs_version: "7.10"
       LINT: 1
 
 services:

documentation/Authentication-Switch.md

@@ -12,7 +12,7 @@ The client respond with opaque blob matching requested plugin via `callback(null
 Example: (imaginary `ssh-key-auth` plugin) pseudo code
 
 ```js
-var conn = mysql.createConnection({
+const conn = mysql.createConnection({
   user: 'test_user',
   password: 'test',
   database: 'test_database',
@@ -24,10 +24,10 @@ var conn = mysql.createConnection({
         // respond with error to propagate error to connect/changeUser handlers
         cb(null, response);
       });
-    } else (
+    } else {
       const err = new Error(`Unknown AuthSwitchRequest plugin name ${pluginName}`);
       err.fatal = true;
-      cb(err)
+      cb(err);
     }
   }
 });

documentation/Promise-Wrapper.md

@@ -13,50 +13,53 @@ In addition to errback interface there is thin wrapper to expose Promise-based a
 ```
 
 ```js
-  /* eslint-env es6 */
-   var pool = require('mysql2/promise').createPool({}); // or mysql.createPoolPromise({})
-   pool.getConnection()
-     .then((conn) => {
-       var res = conn.query('select foo from bar');
-       conn.release();
-       return res;
-     }).then((result) => {
-       console.log(result[0][0].foo);
-     }).catch((err) => {
-       console.log(err); // any of connection time or query time errors from above
-     });
-
+    const pool = require('mysql2/promise').createPool({}); // or mysql.createPoolPromise({})
+    pool.getConnection()
+      .then((conn) => {
+        const res = conn.query('select foo from bar');
+        conn.release();
+        return res;
+      }).then((result) => {
+        console.log(result[0][0].foo);
+      }).catch((err) => {
+        console.log(err); // any of connection time or query time errors from above
+      });
 ```
 ## ES7 Async Await
-<!--eslint-disable-next-block-->
 ```js
-  let mysql = require('mysql2/promise');
-  let conn = await mysql.createConnection({database: test});
+/*
+async function main () {
+  const mysql = require('mysql2/promise');
+  const conn = await mysql.createConnection({ database: test });
   let [rows, fields] = await conn.execute('select ?+? as sum', [2, 2]);
+}
+*/
 ```
 
-<!--eslint-disable-next-block-->
 ```js
+// eslint-disable-next-block
+/*
    let mysql = require('mysql2/promise');
    let pool = mysql.createPool({database: test});
    // execute in parallel, next console.log in 3 seconds
    await Promise.all([pool.query('select sleep(2)'), pool.query('select sleep(3)')]);
    console.log('3 seconds after');
    await pool.end();
    await conn.end();
+*/
 ```
 
 ## With [CO](https://github.com/tj/co)
 <!--eslint-disable-next-block-->
 ```js
 var mysql = require('mysql2');
-var co = require('co')
+var co = require('co');
 co(function * () {
   var c = yield mysql.createConnectionPromise({user: 'root', namedPlaceholders: true });
   var rows = yield c.query('show databases');
   console.log(rows);
-  console.log( yield c.execute('select 1+:toAdd as qqq', {toAdd: 10}) );
+  console.log(yield c.execute('select 1+:toAdd as qqq', {toAdd: 10}));
   yield c.end();
-})
+});
 ```
 Examples in [/examples/promise-co-await](https://github.com/sidorares/node-mysql2/tree/master/examples/promise-co-await)

examples/binlog-watcher.js

@@ -10,7 +10,9 @@ var binlogStream = mysql.createBinlogStream({
   flags: 1 // 1 = "non-blocking mode"
 });
 
-binlogStream.pipe(through2.obj(function (obj, enc, next) {
-  console.log(obj);
-  next();
-}));
+binlogStream.pipe(
+  through2.obj(function(obj, enc, next) {
+    console.log(obj);
+    next();
+  })
+);