Remove unnecessary portal and flush

porsager · porsager · commit 06cc8e4499fa · 2021-09-27T11:39:09.000+02:00
diff --git a/lib/backend.js b/lib/backend.js
@@ -61,7 +61,10 @@ function Backend({
   }
 
   /* c8 ignore next 2 */
-  function BindComplete() { /* No handling needed */ }
+  function BindComplete() {
+    backend.query.result.columns = backend.query.statement.columns
+  }
+
   function CloseComplete() { /* No handling needed */ }
 
   function NotificationResponse(x) {
@@ -77,6 +80,8 @@ function Backend({
   }
 
   function CommandComplete(x) {
+    rows = 0
+
     if (!backend.query)
       return
 
@@ -180,9 +185,7 @@ function Backend({
   }
 
   /* c8 ignore next 3 */
-  function ParameterDescription() {
-    backend.error = errors.notSupported('ParameterDescription')
-  }
+  function ParameterDescription() { /* No handling needed */ }
 
   function RowDescription(x) {
     if (backend.query.result.command) {
@@ -192,8 +195,6 @@ function Backend({
       backend.query.statement.columns = null
     }
 
-    rows = 0
-
     if (backend.query.statement.columns)
       return backend.query.result.columns = backend.query.statement.columns
 
diff --git a/lib/connection.js b/lib/connection.js
@@ -11,6 +11,7 @@ module.exports = Connection
 let count = 1
 
 function Connection(options = {}) {
+  const statements = new Map()
   const {
     onparameter,
     transform,
@@ -31,7 +32,6 @@ function Connection(options = {}) {
   let ready = false
   let write = false
   let next = false
-  let statements = {}
   let connect_timer
   let buffers = null
   let remaining = 0
@@ -73,7 +73,7 @@ function Connection(options = {}) {
     ))).then(x => {
       x === END || done
         ? socket.write(frontend.Close())
-        : socket.write(frontend.Execute(backend.query.cursor.rows))
+        : socket.write(frontend.ExecuteCursor(backend.query.cursor.rows))
     }).catch(err => {
       backend.query.reject(err)
       socket.write(frontend.Close())
@@ -94,7 +94,7 @@ function Connection(options = {}) {
 
   function onparse() {
     if (backend.query && backend.query.statement.sig)
-      statements[backend.query.statement.sig] = backend.query.statement
+      statements.set(backend.query.statement.sig, backend.query.statement)
   }
 
   function onauth(type, x, onerror) {
@@ -132,7 +132,7 @@ function Connection(options = {}) {
 
   function retry(query) {
     query.retried = true
-    delete statements[query.sig]
+    statements.delete(query.sig)
     ready = true
     backend.query = backend.error = null
     send(query, { sig: query.sig, str: query.str, args: query.args })
@@ -150,8 +150,8 @@ function Connection(options = {}) {
       typeof options.debug === 'function' && options.debug(id, str, args)
       const buffer = query.simple
         ? simple(str, query)
-        : sig in statements
-          ? prepared(statements[sig], args, query)
+        : statements.has(sig)
+          ? prepared(statements.get(sig), args, query)
           : prepare(sig, str, args, query)
 
       ready
@@ -187,23 +187,31 @@ function Connection(options = {}) {
 
   function prepared(statement, args, query) {
     query.statement = statement
-    return bind(query, args)
+    return Buffer.concat([
+      frontend.Bind(query.statement.name, args),
+      query.cursor
+        ? frontend.Describe('P')
+        : Buffer.alloc(0),
+      query.cursor
+        ? frontend.ExecuteCursor(query.cursor.rows)
+        : frontend.Execute
+    ])
   }
 
   function prepare(sig, str, args, query) {
     query.statement = { name: sig ? 'p' + uid + statement_id++ : '', sig }
     return Buffer.concat([
       frontend.Parse(query.statement.name, str, args),
-      bind(query, args)
+      frontend.Bind(query.statement.name, args),
+      query.cursor
+        ? frontend.Describe('P')
+        : frontend.Describe('S', query.statement.name),
+      query.cursor
+        ? frontend.ExecuteCursor(query.cursor.rows)
+        : frontend.Execute
     ])
   }
 
-  function bind(query, args) {
-    return query.cursor
-      ? frontend.Bind(query.statement.name, args, query.cursor.rows)
-      : frontend.Bind(query.statement.name, args)
-  }
-
   function idle() {
     if (idle_timeout && !backend.query && queries.length === 0) {
       clearTimeout(timer)
@@ -323,7 +331,7 @@ function Connection(options = {}) {
   }
 
   function cleanup() {
-    statements = {}
+    statements.clear()
     open = ready = write = false
   }
 
diff --git a/lib/frontend.js b/lib/frontend.js
@@ -6,10 +6,9 @@ const { errors } = require('./errors.js')
 const N = String.fromCharCode(0)
 const empty = Buffer.alloc(0)
 const Sync = bytes.S().end()
-const execute = Buffer.concat([
-  bytes.D().str('P').str(N).end(),
+const Flush = bytes.H().end()
+const Execute = Buffer.concat([
   bytes.E().str(N).i32(0).end(),
-  bytes.H().end(),
   bytes.S().end()
 ])
 
@@ -42,10 +41,13 @@ module.exports = {
   auth,
   Bind,
   Sync,
+  Flush,
   Parse,
   Query,
   Close,
   Execute,
+  ExecuteCursor,
+  Describe,
   CopyData,
   CopyDone,
   CopyFail
@@ -170,7 +172,7 @@ function CopyFail(err) {
     .end()
 }
 
-function Bind(name, args, rows = 0) {
+function Bind(name, args) {
   let prev
 
   bytes
@@ -193,16 +195,7 @@ function Bind(name, args, rows = 0) {
 
   bytes.i16(0)
 
-  return Buffer.concat([
-    bytes.end(),
-    rows
-      ? Buffer.concat([
-        bytes.D().str('P').str(N).end(),
-        bytes.E().str(N).i32(rows).end(),
-        bytes.H().end()
-      ])
-      : execute
-  ])
+  return bytes.end()
 }
 
 function Parse(name, str, args) {
@@ -217,7 +210,11 @@ function Parse(name, str, args) {
   return bytes.end()
 }
 
-function Execute(rows) {
+function Describe(x, name = '') {
+  return bytes.D().str(x).str(name + N).end()
+}
+
+function ExecuteCursor(rows) {
   return Buffer.concat([
     bytes.E().str(N).i32(rows).end(),
     bytes.H().end()
