tmthecoder
diff --git a/‎cjs/backend.js
+9-4 b/‎cjs/backend.js
+9-4
diff --git a/‎cjs/connection.js
+20-22 b/‎cjs/connection.js
+20-22
@@ -98,25 +98,28 @@ function Backend({
     let index = 7
     let length
     let column
+    let value
 
     const row = {}
     for (let i = 0; i < backend.query.statement.columns.length; i++) {
       column = backend.query.statement.columns[i]
       length = x.readInt32BE(index)
       index += 4
 
-      row[column.n] = length === -1
+      value = length === -1
         ? null
         : column.p === undefined
           ? x.utf8Slice(index, index += length)
           : column.p.array === true
             ? column.p(x.utf8Slice(index + 1, index += length))
             : column.p(x.utf8Slice(index, index += length))
+
+      row[column.n] = transform.value ? transform.value(value) : value
     }
 
     backend.query.stream
-      ? backend.query.stream(row, rows++)
-      : backend.query.result.push(row)
+      ? backend.query.stream(transform.row ? transform.row(row) : row, rows++)
+      : backend.query.result.push(transform.row ? transform.row(row) : row)
   }
 
   /* c8 ignore next */
@@ -192,7 +195,9 @@ function Backend({
       start = index
       while (x[index++] !== 0);
       backend.query.statement.columns[i] = {
-        n: transform(x.utf8Slice(start, index - 1)),
+        n: transform.column
+          ? transform.column(x.utf8Slice(start, index - 1))
+          : x.utf8Slice(start, index - 1),
         p: parsers[x.readInt32BE(index + 6)]
       }
       index += 18
 
@@ -21,14 +21,15 @@ module.exports = Connection;function Connection(options = {}) {
   let timer
   let id = 1
   let ended
+  let ready = false
 
   const queries = Queue()
       , statements = new Map()
-      , connection = { send, end, destroy, ready: false, active: false }
+      , connection = { send, end, destroy }
 
   const socket = postgresSocket(options, {
+    ready: () => socket.write(frontend.connect(options)),
     data,
-    ready,
     error,
     close
   })
@@ -60,13 +61,13 @@ module.exports = Connection;function Connection(options = {}) {
   function resolve(x) {
     backend.query.resolve(x)
     backend.query = null
-    timeout && connection.active && queries.length === 0 && idle()
+    timeout && queries.length === 0 && idle()
   }
 
   function reject(err) {
     backend.query ? backend.query.reject(err) : error(err)
     backend.query = null
-    timeout && connection.active && queries.length === 0 && idle()
+    timeout && queries.length === 0 && idle()
   }
 
   function end() {
@@ -96,19 +97,21 @@ module.exports = Connection;function Connection(options = {}) {
     query.result = []
     query.result.count = null
     timeout && clearTimeout(timer)
-    !connection.ready || backend.query
-      ? queries.push(query)
-      : (backend.query = query)
 
     const buffer = query.simple
       ? simple(str, query)
       : statements.has(sig)
         ? prepared(statements.get(sig), args, query)
         : prepare(sig, str, args, query)
 
-    connection.ready
-      ? socket.write(buffer)
-      : (messages.push(buffer), socket.connect())
+    if (ready && !backend.query) {
+      backend.query = query
+      socket.write(buffer)
+    } else {
+      queries.push(query)
+      messages.push(buffer)
+      !ready && socket.connect()
+    }
   }
 
   function simple(str, query) {
@@ -135,18 +138,17 @@ module.exports = Connection;function Connection(options = {}) {
   }
 
   function onready() {
-    if (!backend.query)
-      backend.query = queries.shift()
-
     if (!backend.query && queries.length === 0 && ended)
       return ended()
 
-    if (!connection.ready) {
+    if (!ready) {
       messages.forEach(socket.write)
       messages = []
-      connection.ready = true
-      connection.onconnect && connection.onconnect()
+      ready = true
     }
+
+    if (!backend.query)
+      backend.query = queries.shift()
   }
 
   function data(x) {
@@ -164,14 +166,10 @@ module.exports = Connection;function Connection(options = {}) {
     }
   }
 
-  function ready() {
-    socket.write(frontend.connect(options))
-  }
-
   function close() {
     error(errors.connection('CLOSED', options))
     statements.clear()
-    connection.ready = connection.active = false
+    ready = false
   }
 
   function unknown() {
@@ -196,7 +194,7 @@ function postgresSocket(options, {
       return Promise.resolve()
     },
     end: () => {
-      return new Promise(r => socket.end(r))
+      return new Promise(r => socket && socket.end(r))
     },
     connect
   }