More efficient handling for prepared statements

porsager · porsager · commit 5fb17fbee11d · 2019-11-23T14:44:06.000+01:00
diff --git a/lib/index.js b/lib/index.js
@@ -304,38 +304,42 @@ export default function Postgres(url, options) {
 
   function parse(xs, args = []) {
     const xargs = []
+        , types = []
+
     let str = xs[0]
     let arg
 
     for (let i = 1; i < xs.length; i++) {
       arg = args[i - 1]
       str += (arg.rows
-        ? parseRows(arg.rows, xargs)
+        ? parseRows(arg.rows, xargs, types)
         : arg.row
-          ? parseRow(arg.row, xargs)
-          : parseValue(arg, xargs)
+          ? parseRow(arg.row, xargs, types)
+          : parseValue(arg, xargs, types)
       ) + xs[i]
     }
 
     return {
-      sig: args.length === xargs.length ? xargs.map(x => x.type) + str : null,
+      sig: !xargs.dynamic && types + str,
       str: str.trim(),
       args: xargs
     }
   }
 
-  function parseRows(rows, xargs) {
-    return rows.map(row => parseRow(row, xargs)).join(',')
+  function parseRows(rows, xargs, types) {
+    xargs.dynamic = true
+    return rows.map(row => parseRow(row, xargs, types)).join(',')
   }
 
-  function parseRow(row, xargs) {
-    return '(' + row.map(x => parseValue(x, xargs)).join(',') + ')'
+  function parseRow(row, xargs, types) {
+    return '(' + row.map(x => parseValue(x, xargs, types)).join(',') + ')'
   }
 
-  function parseValue(x, xargs) {
+  function parseValue(x, xargs, types) {
     const value = x.value ? x.value : x
         , type = x.type || (Array.isArray(value) ? typeArrayMap[inferType(value)] : inferType(value))
 
+    types.push(type)
     return '$' + xargs.push({
       type,
       value: type
