Add proper uniqueness to prepared statements

porsager · porsager · commit 13bac30b65fd · 2019-11-23T12:10:10.000+01:00
diff --git a/lib/connection.js b/lib/connection.js
@@ -84,28 +84,28 @@ export default function Connection(options = {}) {
       q.reject(err)
   }
 
-  function send(query, { str, args = [] }) {
+  function send(query, { sig, str, args = [] }) {
     timeout && clearTimeout(timer)
     !connection.ready || backend.query
       ? queries.push(query)
       : (backend.query = query)
 
-    const buffer = statements.has(str)
-      ? prepared(statements.get(str), str, args)
-      : prepare(str, args)
+    const buffer = statements.has(sig)
+      ? prepared(statements.get(sig), args)
+      : prepare(sig, str, args)
 
     connection.ready
       ? socket.write(buffer)
       : (messages.push(buffer), socket.connect())
   }
 
-  function prepared(name, str, args) {
+  function prepared(name, args) {
     return frontend.Bind(name, args)
   }
 
-  function prepare(str, args) {
-    const name = 'p' + id++
-    statements.set(str, name)
+  function prepare(sig, str, args) {
+    const name = sig ? 'p' + id++ : ''
+    sig && statements.set(sig, name)
     return Buffer.concat([
       frontend.Parse(name, str, args),
       frontend.Bind(name, args)
diff --git a/lib/index.js b/lib/index.js
@@ -302,7 +302,7 @@ export default function Postgres(url, options) {
     .then(() => clearTimeout(destroy))
   }
 
-  function parse(xs, args) {
+  function parse(xs, args = []) {
     const xargs = []
     let str = xs[0]
     let arg
@@ -318,6 +318,7 @@ export default function Postgres(url, options) {
     }
 
     return {
+      sig: args.length === xargs.length ? xargs.map(x => x.type) + str : null,
       str: str.trim(),
       args: xargs
     }

Original file line number	Diff line number	Diff line change
`@@ -302,7 +302,7 @@ export default function Postgres(url, options) {`
`302`	`302`	`.then(() => clearTimeout(destroy))`
`303`	`303`	`}`
`304`	`304`
`305`		`- function parse(xs, args) {`
	`305`	`+ function parse(xs, args = []) {`
`306`	`306`	`const xargs = []`
`307`	`307`	`let str = xs[0]`
`308`	`308`	`let arg`
`@@ -318,6 +318,7 @@ export default function Postgres(url, options) {`
`318`	`318`	`}`
`319`	`319`
`320`	`320`	`return {`
	`321`	`+ sig: args.length === xargs.length ? xargs.map(x => x.type) + str : null,`
`321`	`322`	`str: str.trim(),`
`322`	`323`	`args: xargs`
`323`	`324`	`}`