Properly throw initial cursor errors

Author: porsager

lib/backend.js

@@ -11,13 +11,13 @@ function Backend({
   onparameter,
   onsuspended,
   oncomplete,
+  onerror,
   parsers,
   onauth,
   onready,
   transform,
   onnotice,
-  onnotify,
-  error
+  onnotify
 }) {
   let rows = 0
 
@@ -126,9 +126,7 @@ function Backend({
   function CopyData() { /* No handling needed until implemented */ }
 
   function ErrorResponse(x) {
-    backend.query
-      ? (backend.error = errors.postgres(parseError(x)))
-      : error(errors.postgres(parseError(x)))
+    onerror(errors.postgres(parseError(x)))
   }
 
   /* c8 ignore next 3 */
@@ -159,7 +157,7 @@ function Backend({
 
   function Authentication(x) {
     const type = x.readInt32BE(5)
-    type !== 0 && onauth(type, x, error)
+    type !== 0 && onauth(type, x, onerror)
   }
 
   function ParameterStatus(x) {

lib/connection.js

@@ -52,6 +52,7 @@ function Connection(options = {}) {
     onparameter,
     onsuspended,
     oncomplete,
+    onerror,
     transform,
     parsers,
     onnotify,
@@ -78,6 +79,14 @@ function Connection(options = {}) {
     backend.query.cursor && onsuspended(backend.query.result, true)
   }
 
+  function onerror(x) {
+    if (!backend.query)
+      return error(x)
+
+    backend.error = x
+    backend.query.cursor && socket.write(frontend.Sync)
+  }
+
   function onparse() {
     if (backend.query && backend.query.statement.sig)
       statements[backend.query.statement.sig] = backend.query.statement

lib/frontend.js

@@ -5,6 +5,7 @@ const { errors } = require('./errors.js')
 
 const N = String.fromCharCode(0)
 const empty = Buffer.alloc(0)
+const Sync = bytes.S().end()
 const execute = Buffer.concat([
   bytes.D().str('P').str(N).end(),
   bytes.E().str(N).i32(0).end(),
@@ -40,6 +41,7 @@ module.exports = {
   SSLRequest,
   auth,
   Bind,
+  Sync,
   Parse,
   Query,
   Close,

lib/index.js

@@ -285,7 +285,7 @@ function Postgres(a, b) {
     }
 
     function unsafe(xs, args, queryOptions) {
-      const prepare = queryOptions && queryOptions.prepare || false;
+      const prepare = queryOptions && queryOptions.prepare || false
       return query({ raw: true, simple: !args, prepare }, connection || getConnection(), xs, args || [])
     }
 

tests/index.js

@@ -991,6 +991,11 @@ t('Cursor throw works', async() => {
   return ['1aerr', order.join('')]
 })
 
+t('Cursor throw works', async() => [
+  'err',
+  await sql`wat`.cursor(() => { /* noop */ }).catch(() => 'err')
+])
+
 t('Transform row', async() => {
   const sql = postgres({
     ...options,
@@ -1240,13 +1245,13 @@ t('prepare: true enables prepared transactions', async() => {
 
 t('prepares unsafe query when "prepare" option is true', async() => {
   const sql = postgres({ ...options, prepare: true })
-  const result = await sql.unsafe('select * from pg_prepared_statements where name <> $1', ["bla"], { prepare: true })
+  const result = await sql.unsafe('select * from pg_prepared_statements where name <> $1', ['bla'], { prepare: true })
   return [result[0].statement, 'select * from pg_prepared_statements where name <> $1']
 })
 
 t('does not prepare unsafe query by default', async() => {
-  const sql = postgres({ ...options, prepare: true });
-  const result = await sql.unsafe('select * from pg_prepared_statements where name <> $1', ["bla"])
+  const sql = postgres({ ...options, prepare: true })
+  const result = await sql.unsafe('select * from pg_prepared_statements where name <> $1', ['bla'])
   return [0, result.count]
 })