Fix onconnect

porsager · porsager · commit 25b464424b23 · 2019-11-27T23:36:07.000+01:00
diff --git a/lib/connection.js b/lib/connection.js
@@ -140,6 +140,7 @@ export default function Connection(options = {}) {
       messages.forEach(socket.write)
       messages = []
       connection.ready = true
+      connection.onconnect && connection.onconnect()
     }
   }
 
diff --git a/lib/index.js b/lib/index.js
@@ -180,15 +180,23 @@ export default function Postgres(url, options) {
 
   function instance(fn, connection) {
     let queries = 0
+      , container
+
     addTypes(scoped, connection)
-    const container = fn(scoped)
+    connection.onconnect = onconnect
+
     function scoped(xs, ...args) {
       queries++
       const promise = query({}, connection, xs, args)
       promise.then(finished, finished)
       return promise
     }
 
+    function onconnect() {
+      container = fn(scoped)
+      queries === 0 && finished(queries++)
+    }
+
     function finished() {
       --queries === 0 && Promise.resolve(container).then(() => {
         connections.push(connection)

Original file line number	Diff line number	Diff line change
`@@ -140,6 +140,7 @@ export default function Connection(options = {}) {`
`140`	`140`	`messages.forEach(socket.write)`
`141`	`141`	`messages = []`
`142`	`142`	`connection.ready = true`
	`143`	`+ connection.onconnect && connection.onconnect()`
`143`	`144`	`}`
`144`	`145`	`}`
`145`	`146`