Fix connection pooling

porsager · porsager · commit 7c6f4b8c3090 · 2019-11-23T14:56:37.000+01:00
diff --git a/README.md b/README.md
@@ -41,7 +41,7 @@ const postgres = require('postgres/cjs')
 
 const sql = postgres('postgres://user:pass@host:port/database', {
   ssl         : false,      // True, or an object with options to tls.connect
-  connections : 10,         // Max number of connections
+  max         : 10,         // Max number of connections
   timeout     : 0,          // Idle connection timeout in seconds
   types       : [],         // Custom types, see section below
   onconnect   : null,       // Runs before any queries on each connect
diff --git a/lib/index.js b/lib/index.js
@@ -18,7 +18,7 @@ export default function Postgres(url, options) {
   let ready = false
     , ended = null
     , arrayTypesPromise
-    , max = Math.max(1, options.connections || options.max)
+    , max = Math.max(1, options.max)
     , listener
 
   const connections = Queue()
@@ -152,9 +152,9 @@ export default function Postgres(url, options) {
   }
 
   function getConnection(reserve) {
-    const connection = connections.shift() || (--max && createConnection(options))
+    const connection = --max >= 0 ? createConnection(options) : connections.shift()
     !options.fifo && !reserve && connection && connections.push(connection)
-    connection.active = !(options.onconnect && !connection.ready)
+    connection && (connection.active = !(options.onconnect && !connection.ready))
     return options.onconnect && !connection.ready
       ? instance({ fn: options.onconnect }, connection)
       : connection
