Fix wrong api usage errors being swallowed

porsager · porsager · commit a891603c771e · 2020-09-29T09:42:37.000+02:00
diff --git a/lib/connection.js b/lib/connection.js
@@ -66,8 +66,8 @@ function Connection(options = {}) {
         ? socket.write(frontend.Close())
         : socket.write(frontend.Execute(backend.query.cursor.rows))
     }).catch(err => {
-      socket.write(frontend.Close())
       backend.query.reject(err)
+      socket.write(frontend.Close())
     })
   }
 
@@ -114,6 +114,7 @@ function Connection(options = {}) {
   }
 
   function send(query, { sig, str, args = [] }) {
+    try {
       query.str = str
       query.args = args
       query.result = []
@@ -134,6 +135,9 @@ function Connection(options = {}) {
       open
         ? socket.write(buffer)
         : (messages.push(buffer), connect())
+    } catch (err) {
+      query.reject(err)
+    }
   }
 
   function connect() {
diff --git a/tests/index.js b/tests/index.js
@@ -1084,3 +1084,8 @@ o('Catches connection config errors', async() => {
     await sql`select 1`.catch((e) => e.message)
   ]
 })
+
+o('Catches query format errors', async() => [
+  'wat',
+  await sql.unsafe({ toString: () => { throw new Error('wat') } }).catch((e) => e.message)
+])

Original file line number	Diff line number	Diff line change
`@@ -1084,3 +1084,8 @@ o('Catches connection config errors', async() => {`
`1084`	`1084`	await sql`select 1`.catch((e) => e.message)
`1085`	`1085`	`]`
`1086`	`1086`	`})`
	`1087`	`+`
	`1088`	`+o('Catches query format errors', async() => [`
	`1089`	`+ 'wat',`
	`1090`	`+ await sql.unsafe({ toString: () => { throw new Error('wat') } }).catch((e) => e.message)`
	`1091`	`+])`