From 3ead90034930536ebeb11a48dada75323e9eb2fe Mon Sep 17 00:00:00 2001
From: Sehrope Sarkuni <sehrope@jackdb.com>
Date: Thu, 25 Jul 2019 14:00:14 -0400
Subject: [PATCH] Fix eslint and add back standard (#1928)

* lint: Enable standard rules again

* lint: Replace hasOwnProperty(...) call

* lint: Remove trailing spaces

* lint: Remove spaces within array brackets

* lint: Disable quote-props to silence linter

* lint: Skip linting on older node versions
---
 .eslintrc                    | 1 +
 Makefile                     | 4 +++-
 lib/connection-parameters.js | 4 ++--
 lib/connection.js            | 2 +-
 lib/defaults.js              | 2 +-
 lib/native/query.js          | 1 +
 package.json                 | 8 ++++++--
 7 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/.eslintrc b/.eslintrc
index 4a130fab6..43aee6027 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -3,6 +3,7 @@
     "node"
   ],
   "extends": [
+    "standard",
     "eslint:recommended",
     "plugin:node/recommended"
   ],
diff --git a/Makefile b/Makefile
index a5b0bc1da..52d0545d3 100644
--- a/Makefile
+++ b/Makefile
@@ -62,4 +62,6 @@ test-pool:
 
 lint:
 	@echo "***Starting lint***"
-	node_modules/.bin/eslint lib
+	node -e "process.exit(Number(process.versions.node.split('.')[0]) < 8 ? 0 : 1)" \
+	  && echo "***Skipping lint (node version too old)***" \
+	  || node_modules/.bin/eslint lib
diff --git a/lib/connection-parameters.js b/lib/connection-parameters.js
index f45dc50a4..00ea76111 100644
--- a/lib/connection-parameters.js
+++ b/lib/connection-parameters.js
@@ -15,11 +15,11 @@ var parse = require('pg-connection-string').parse // parses a connection string
 
 var val = function (key, config, envVar) {
   if (envVar === undefined) {
-    envVar = process.env[ 'PG' + key.toUpperCase() ]
+    envVar = process.env['PG' + key.toUpperCase()]
   } else if (envVar === false) {
     // do nothing ... use false
   } else {
-    envVar = process.env[ envVar ]
+    envVar = process.env[envVar]
   }
 
   return config[key] ||
diff --git a/lib/connection.js b/lib/connection.js
index abb6ad6dd..48d65d25f 100644
--- a/lib/connection.js
+++ b/lib/connection.js
@@ -604,7 +604,7 @@ Connection.prototype.parseE = function (buffer, length) {
     msg = new Error(fields.M)
     for (item in input) {
       // copy input properties to the error
-      if (input.hasOwnProperty(item)) {
+      if (Object.prototype.hasOwnProperty.call(input, item)) {
         msg[item] = input[item]
       }
     }
diff --git a/lib/defaults.js b/lib/defaults.js
index f883e982f..bd1bf6de6 100644
--- a/lib/defaults.js
+++ b/lib/defaults.js
@@ -50,7 +50,7 @@ module.exports = {
   ssl: false,
 
   application_name: undefined,
-  
+
   fallback_application_name: undefined,
 
   parseInputDatesAsUTC: false,
diff --git a/lib/native/query.js b/lib/native/query.js
index 74bfb0601..0c83e27e3 100644
--- a/lib/native/query.js
+++ b/lib/native/query.js
@@ -35,6 +35,7 @@ var NativeQuery = module.exports = function (config, values, callback) {
 util.inherits(NativeQuery, EventEmitter)
 
 var errorFieldMap = {
+  /* eslint-disable quote-props */
   'sqlState': 'code',
   'statementPosition': 'position',
   'messagePrimary': 'message',
diff --git a/package.json b/package.json
index c7b3ce039..20fc16122 100644
--- a/package.json
+++ b/package.json
@@ -31,8 +31,12 @@
     "async": "0.9.0",
     "bluebird": "3.5.2",
     "co": "4.6.0",
-    "eslint": "^4.19.1",
-    "eslint-plugin-node": "^6.0.1",
+    "eslint": "^6.0.1",
+    "eslint-config-standard": "^13.0.1",
+    "eslint-plugin-import": "^2.18.1",
+    "eslint-plugin-node": "^9.1.0",
+    "eslint-plugin-promise": "^4.2.1",
+    "eslint-plugin-standard": "^4.0.0",
     "pg-copy-streams": "0.3.0"
   },
   "minNativeVersion": "2.0.0",