Fix unsafe and file queries

porsager · porsager · commit dd2a8258108f · 2019-12-18T22:32:39.000+01:00
diff --git a/lib/index.js b/lib/index.js
@@ -250,21 +250,25 @@ function Postgres(url, options) {
       return sql`select pg_notify(${ channel }, ${ '' + payload })`
     }
 
-    function unsafe(xs, args, options = {}) {
+    function unsafe(xs, args) {
+      return query({ raw: true, simple: !args }, connection || getConnection(), xs, args || [])
+    }
+
+    function file(path, args, options) {
       if (!Array.isArray(args)) {
-        options = args || []
-        args = []
+        options = args || {}
+        args = null
       }
-      return query({ raw: true, simple: options.simple }, connection || getConnection(), xs, args)
-    }
 
-    function file(path) {
+      if ('cache' in options === false)
+        options.cache = true
+
       const file = files[path]
+      const q = { raw: true, simple: !args }
 
-      if (typeof file === 'string')
-        return query({ raw: true, simple: true }, connection || getConnection(), files[path])
+      if (options.cache && typeof file === 'string')
+        return query(q, connection || getConnection(), file, args || [])
 
-      const q = { raw: true, simple: true }
       const promise = (file || (files[path] = new Promise((resolve, reject) => {
         fs.readFile(path, 'utf8', (err, str) => {
           if (err)
@@ -273,7 +277,7 @@ function Postgres(url, options) {
           files[path] = str
           resolve(str)
         })
-      }))).then((str) => query(q, connection || getConnection(), str))
+      }))).then(str => query(q, connection || getConnection(), str, args || []))
 
       promise.stream = fn => (q.stream = fn, promise)
 
diff --git a/tests/index.js b/tests/index.js
@@ -337,7 +337,7 @@ t('unsafe', async() => {
 }, () => sql`drop table test`)
 
 t('unsafe simple', async() => {
-  return [1, (await sql.unsafe('select 1 as x', { simple: true }))[0].x]
+  return [1, (await sql.unsafe('select 1 as x'))[0].x]
 })
 
 t('listen and notify', async() => {
@@ -521,7 +521,7 @@ t('Multiple statements', async() =>
   [2, await sql.unsafe(`
     select 1 as x;
     select 2 as x;
-  `, { simple: true }).then(([, x]) => x.x)]
+  `).then(([, x]) => x.x)]
 )
 
 t('throws correct error when authentication fails', async() => {
