Add simple

porsager · porsager · commit e492370b760e · 2019-11-27T23:35:55.000+01:00
diff --git a/lib/connection.js b/lib/connection.js
@@ -100,9 +100,11 @@ export default function Connection(options = {}) {
       ? queries.push(query)
       : (backend.query = query)
 
-    const buffer = statements.has(sig)
-      ? prepared(statements.get(sig), args, query)
-      : prepare(sig, str, args, query)
+    const buffer = query.simple
+      ? frontend.Query(str)
+      : statements.has(sig)
+        ? prepared(statements.get(sig), args, query)
+        : prepare(sig, str, args, query)
 
     connection.ready
       ? socket.write(buffer)
diff --git a/lib/index.js b/lib/index.js
@@ -37,7 +37,7 @@ export default function Postgres(url, options) {
       , typeArrayMap = {}
 
   function postgres(xs, ...args) {
-    return query(false, getConnection(), xs, args)
+    return query({}, getConnection(), xs, args)
   }
 
   Object.assign(postgres, {
@@ -93,7 +93,7 @@ export default function Postgres(url, options) {
       }, connection)
     })
 
-    query(true, connection, begin || savepoint)
+    query({ raw: true }, connection, begin || savepoint)
       .then(() => {
         const result = fn(scoped)
         return Array.isArray(result)
@@ -106,7 +106,7 @@ export default function Postgres(url, options) {
           : resolve(x)
       )
       .catch((err) => {
-        query(true, connection,
+        query({ raw: true }, connection,
           begin
             ? 'rollback'
             : 'rollback to ' + savepoint
@@ -119,7 +119,7 @@ export default function Postgres(url, options) {
       })
 
     function scoped(xs, ...args) {
-      return query(false, connection, xs, args).catch(reject)
+      return query({}, connection, xs, args).catch(reject)
     }
   }
 
@@ -133,11 +133,11 @@ export default function Postgres(url, options) {
     }
   }
 
-  function query(raw, connection, xs, args) {
+  function query({ raw, simple }, connection, xs, args) {
     if (!raw && (!Array.isArray(xs) || !Array.isArray(xs.raw)))
       throw errors.generic({ message: 'Query not called as a tagged template literal', code: 'NOT_TAGGED_CALL' })
 
-    const query = { raw }
+    const query = { raw, simple }
 
     const promise = new Promise((resolve, reject) => {
       query.resolve = resolve
@@ -184,7 +184,7 @@ export default function Postgres(url, options) {
     const container = fn(scoped)
     function scoped(xs, ...args) {
       queries++
-      const promise = query(false, connection, xs, args)
+      const promise = query({}, connection, xs, args)
       promise.then(finished, finished)
       return promise
     }
@@ -255,14 +255,26 @@ export default function Postgres(url, options) {
 
   function addTypes(sql, connection) {
     Object.assign(sql, {
-      notify: (channel, payload) => sql`select pg_notify(${ channel }, ${ '' + payload })`,
-      unsafe: (xs, args) => query(true, connection || getConnection(), xs, args),
+      notify,
+      unsafe,
       array,
       rows,
       row,
       json
     })
 
+    function notify(channel, payload) {
+      return sql`select pg_notify(${ channel }, ${ '' + payload })`
+    }
+
+    function unsafe(xs, args, options = {}) {
+      if (!Array.isArray(args)) {
+        options = args || []
+        args = []
+      }
+      return query({ raw: true, simple: options.simple }, connection || getConnection(), xs, args)
+    }
+
     options.types && Object.entries(options.types).forEach(([name, type]) => {
       if (name in sql)
         throw errors.generic({ message: name + ' is a reserved method name', code: 'RESERVED_METHOD_NAME' })
@@ -279,7 +291,7 @@ export default function Postgres(url, options) {
       ? listeners[x].push(fn)
       : (listeners[x] = [fn])
 
-    return query(true, getListener(), 'listen "' + x + '"').then(() => x)
+    return query({ raw: true}, getListener(), 'listen "' + x + '"').then(() => x)
   }
 
   function getListener() {
