Make unsafe queries dynamic by default

porsager · porsager · commit 41af85f2a0f5 · 2019-12-22T11:40:08.000+01:00
diff --git a/lib/index.js b/lib/index.js
@@ -182,7 +182,7 @@ function Postgres(url, options) {
 
   function send(connection, query, xs, args) {
     connection
-      ? connection.send(query, query.raw ? parseRaw(xs, args) : parse(xs, args))
+      ? connection.send(query, query.raw ? parseRaw(xs, args) : parse(query, xs, args))
       : queries.push({ query, xs, args })
   }
 
@@ -252,7 +252,7 @@ function Postgres(url, options) {
     }
 
     function unsafe(xs, args) {
-      return query({ raw: true, simple: !args }, connection || getConnection(), xs, args || [])
+      return query({ raw: true, simple: !args, dynamic: true }, connection || getConnection(), xs, args || [])
     }
 
     function file(path, args, options) {
@@ -346,7 +346,7 @@ function Postgres(url, options) {
     }
   }
 
-  function parse(xs, args = []) {
+  function parse(query, xs, args = []) {
     const xargs = []
         , types = []
 
@@ -362,7 +362,7 @@ function Postgres(url, options) {
     }
 
     return {
-      sig: !xargs.dynamic && types + str,
+      sig: !query.dynamic && !xargs.dynamic && types + str,
       str: str.trim(),
       args: xargs
     }

Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,7 @@ function Postgres(url, options) {`
`182`	`182`
`183`	`183`	`function send(connection, query, xs, args) {`
`184`	`184`	`connection`
`185`		`- ? connection.send(query, query.raw ? parseRaw(xs, args) : parse(xs, args))`
	`185`	`+ ? connection.send(query, query.raw ? parseRaw(xs, args) : parse(query, xs, args))`
`186`	`186`	`: queries.push({ query, xs, args })`
`187`	`187`	`}`
`188`	`188`
`@@ -252,7 +252,7 @@ function Postgres(url, options) {`
`252`	`252`	`}`
`253`	`253`
`254`	`254`	`function unsafe(xs, args) {`
`255`		`- return query({ raw: true, simple: !args }, connection \|\| getConnection(), xs, args \|\| [])`
	`255`	`+ return query({ raw: true, simple: !args, dynamic: true }, connection \|\| getConnection(), xs, args \|\| [])`
`256`	`256`	`}`
`257`	`257`
`258`	`258`	`function file(path, args, options) {`
`@@ -346,7 +346,7 @@ function Postgres(url, options) {`
`346`	`346`	`}`
`347`	`347`	`}`
`348`	`348`
`349`		`- function parse(xs, args = []) {`
	`349`	`+ function parse(query, xs, args = []) {`
`350`	`350`	`const xargs = []`
`351`	`351`	`, types = []`
`352`	`352`
`@@ -362,7 +362,7 @@ function Postgres(url, options) {`
`362`	`362`	`}`
`363`	`363`
`364`	`364`	`return {`
`365`		`- sig: !xargs.dynamic && types + str,`
	`365`	`+ sig: !query.dynamic && !xargs.dynamic && types + str,`
`366`	`366`	`str: str.trim(),`
`367`	`367`	`args: xargs`
`368`	`368`	`}`