Please eslint

Author: porsager

lib/connection.js

@@ -137,7 +137,10 @@ function Connection(options = {}) {
   }
 
   function connect() {
-    connect_timeout && (clearTimeout(connect_timer), connect_timer = setTimeout(connectTimedOut, connect_timeout * 1000))
+    connect_timeout && (
+      clearTimeout(connect_timer),
+      connect_timer = setTimeout(connectTimedOut, connect_timeout * 1000)
+    )
     socket.connect()
   }
 

lib/index.js

@@ -444,8 +444,9 @@ function Postgres(a, b) {
       acc + (!columns.length || columns.indexOf(k) > -1
         ? (acc ? ',' : '') + parseValue(v, xargs, types) + ' as ' + escape(k)
         : ''
-      )
-    , '')
+      ),
+      ''
+    )
   }
 
   function insertHelper(first, columns, xargs, types) {
@@ -455,14 +456,16 @@ function Postgres(a, b) {
     first.reduce((acc, row) =>
       acc + (acc ? ',' : '') + '(' +
         columns.reduce((acc, k) => acc + (acc ? ',' : '') + parseValue(row[k], xargs, types), '') +
-      ')'
-    , '')
+      ')',
+      ''
+    )
   }
 
   function equalsHelper(first, columns, xargs, types) {
     return (columns.length ? columns : Object.keys(first)).reduce((acc, k) =>
-      acc + (acc ? ',' : '') + escape(k) + ' = ' + parseValue(first[k], xargs, types)
-    , '')
+      acc + (acc ? ',' : '') + escape(k) + ' = ' + parseValue(first[k], xargs, types),
+      ''
+    )
   }
 
   function escapeHelper(xs) {
@@ -476,8 +479,8 @@ function Postgres(a, b) {
     return Array.isArray(x)
       ? x.reduce((acc, x) => acc + (acc ? ',' : '') + addValue(x, xargs, types), '')
       : x && x.P === notPromise.P
-      ? parseArg('', x, xargs, types)
-      : addValue(x, xargs, types)
+        ? parseArg('', x, xargs, types)
+        : addValue(x, xargs, types)
   }
 
   function addValue(x, xargs, types) {
@@ -523,8 +526,8 @@ function parseOptions(a, b) {
     max             : o.max || url.query.max || 10,
     types           : o.types || {},
     ssl             : o.ssl || url.ssl || false,
-    idle_timeout    : o.idle_timeout || url.query.idle_timeout || env.PGIDLE_TIMEOUT || warn(o.timeout, 'The timeout option is deprecated, use idle_timeout instead'),
-    connect_timeout : o.connect_timeout || url.query.connect_timeout || env.PGCONNECT_TIMEOUT || 30,
+    idle_timeout    : o.idle_timeout || url.query.idle_timeout || env.PGIDLE_TIMEOUT || warn(o.timeout),
+    connect_timeout : o.connect_timeout || url.query.connect_timeout || env.PGCONNECT_TIMEOUT || 30,
     onnotice        : o.onnotice,
     onparameter     : o.onparameter,
     transform       : Object.assign({}, o.transform),
@@ -535,8 +538,8 @@ function parseOptions(a, b) {
   )
 }
 
-function warn(x, message) {
-  typeof x !== 'undefined' && console.log(message)
+function warn(x) {
+  typeof x !== 'undefined' && console.log('The timeout option is deprecated, use idle_timeout instead') // eslint-disable-line
   return x
 }
 

tests/index.js

@@ -439,7 +439,8 @@ t('Connection destroyed', async() => {
 
 t('Connection destroyed with query before', async() => {
   const sql = postgres(options)
-  let error = sql`select pg_sleep(0.2)`.catch(err => err.code)
+      , error = sql`select pg_sleep(0.2)`.catch(err => err.code)
+
   sql.end({ timeout: 0 })
   return ['CONNECTION_DESTROYED', await error]
 })
@@ -684,21 +685,30 @@ t('dynamic multi row insert', async() => {
   await sql`create table test (a int, b text)`
   const x = { a: 42, b: 'the answer' }
 
-  return ['the answer', (await sql`insert into test ${ sql([x, x]) } returning *`)[1].b, await sql`drop table test`]
+  return [
+    'the answer',
+    (await sql`insert into test ${ sql([x, x]) } returning *`)[1].b, await sql`drop table test`
+  ]
 })
 
 t('dynamic update', async() => {
   await sql`create table test (a int, b text)`
   await sql`insert into test (a, b) values (17, 'wrong')`
 
-  return ['the answer', (await sql`update test set ${ sql({ a: 42, b: 'the answer' }) } returning *`)[0].b, await sql`drop table test`]
+  return [
+    'the answer',
+    (await sql`update test set ${ sql({ a: 42, b: 'the answer' }) } returning *`)[0].b, await sql`drop table test`
+  ]
 })
 
 t('dynamic update pluck', async() => {
   await sql`create table test (a int, b text)`
   await sql`insert into test (a, b) values (17, 'wrong')`
 
-  return ['wrong', (await sql`update test set ${ sql({ a: 42, b: 'the answer' }, 'a') } returning *`)[0].b, await sql`drop table test`]
+  return [
+    'wrong',
+    (await sql`update test set ${ sql({ a: 42, b: 'the answer' }, 'a') } returning *`)[0].b, await sql`drop table test`
+  ]
 })
 
 t('dynamic select array', async() => {
@@ -945,8 +955,8 @@ t('Error contains query parameters', async() => [
 t('Query string is not enumerable', async() => {
   const sql = postgres({ ...options, debug: false })
   return [
-  -1,
-  (await sql`selec 1`.catch(err => Object.keys(err).indexOf('query')))
+    -1,
+    (await sql`selec 1`.catch(err => Object.keys(err).indexOf('query')))
   ]
 })