lint: sync rules with mysqljs/mysql

Author: dougwilson

.eslintrc

@@ -5,8 +5,11 @@
   "rules": {
     "comma-dangle": [2, "never"],
     "consistent-return": 2,
-    "indent": ["error", 2, {"SwitchCase": 1}],
+    "eqeqeq": [2, "allow-null"],
+    "indent": [2, 2, { "VariableDeclarator": 2, "SwitchCase": 1 }],
     "key-spacing": [2, { "align": { "beforeColon": true, "afterColon": true, "on": "colon" } }],
+    "keyword-spacing": 2,
+    "new-parens": 2,
     "no-cond-assign": 2,
     "no-constant-condition": 2,
     "no-control-regex": 2,
@@ -23,6 +26,7 @@
     "no-inner-declarations": 2,
     "no-invalid-regexp": 2,
     "no-irregular-whitespace": 2,
+    "no-multiple-empty-lines": [2, { "max": 1 }],
     "no-negated-in-lhs": 2,
     "no-obj-calls": 2,
     "no-regex-spaces": 2,
@@ -31,7 +35,9 @@
     "no-unexpected-multiline": 2,
     "no-unreachable": 2,
     "no-unused-vars": 2,
+    "quotes": [2, "single", { "avoidEscape": true, "allowTemplateLiterals": true }],
     "semi": [2, "always"],
+    "semi-spacing": 2,
     "space-infix-ops": 2,
     "use-isnan": 2,
     "valid-jsdoc": 2,

README.md

@@ -92,7 +92,7 @@ If you feel the need to escape queries by yourself, you can also use the escapin
 function directly:
 
 ```js
-var sql = 'SELECT * FROM posts WHERE title=' + SqlString.escape("Hello MySQL");
+var sql = 'SELECT * FROM posts WHERE title=' + SqlString.escape('Hello MySQL');
 console.log(sql); // SELECT * FROM posts WHERE title='Hello MySQL'
 ```
 

lib/SqlString.js

@@ -155,7 +155,7 @@ SqlString.dateToString = function dateToString(date, timeZone) {
 };
 
 SqlString.bufferToString = function bufferToString(buffer) {
-  return "X" + escapeString(buffer.toString('hex'));
+  return 'X' + escapeString(buffer.toString('hex'));
 };
 
 SqlString.objectToValues = function objectToValues(object, timeZone) {
@@ -212,7 +212,7 @@ function convertTimezone(tz) {
 
   var m = tz.match(/([\+\-\s])(\d\d):?(\d\d)?/);
   if (m) {
-    return (m[1] == '-' ? -1 : 1) * (parseInt(m[2], 10) + ((m[3] ? parseInt(m[3], 10) : 0) / 60)) * 60;
+    return (m[1] === '-' ? -1 : 1) * (parseInt(m[2], 10) + ((m[3] ? parseInt(m[3], 10) : 0) / 60)) * 60;
   }
   return false;
 }

test/unit/test-SqlString.js

@@ -28,11 +28,11 @@ test('SqlString.escapeId', {
   },
 
   'arrays are turned into lists': function() {
-    assert.equal(SqlString.escapeId(['a', 'b', 't.c']), "`a`, `b`, `t`.`c`");
+    assert.equal(SqlString.escapeId(['a', 'b', 't.c']), '`a`, `b`, `t`.`c`');
   },
 
   'nested arrays are flattened': function() {
-    assert.equal(SqlString.escapeId(['a', ['b', ['t.c']]]), "`a`, `b`, `t`.`c`");
+    assert.equal(SqlString.escapeId(['a', ['b', ['t.c']]]), '`a`, `b`, `t`.`c`');
   }
 });