Ensure retryRoutines are only used for prepared statements - fixes #830

porsager · Mar 20, 2024 · 3e28f3a · 3e28f3a
1 parent 2b85ea7
commit 3e28f3a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/src/connection.js b/src/connection.js
@@ -788,7 +788,7 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose
     const error = Errors.postgres(parseError(x))
     query && query.retried
       ? errored(query.retried)
-      : query && retryRoutines.has(error.routine)
+      : query && query.prepare && retryRoutines.has(error.routine)
         ? retry(query, error)
         : errored(error)
   }

diff --git a/tests/index.js b/tests/index.js
@@ -1789,6 +1789,21 @@ t('Recreate prepared statements on RevalidateCachedQuery error', async() => {
   ]
 })
 
+t('Properly throws routing error on not prepared statements', async() => {
+  await sql`create table x (x text[])`
+  const { routine } = await sql.unsafe(`insert into x(x) values (('a', 'b'))`).catch(e => e)
+
+  return ['transformAssignedExpr', routine, await sql`drop table x`]
+})
+
+t('Properly throws routing error on not prepared statements in transaction', async() => {
+  const { routine } = await sql.begin(sql => [
+    sql`create table x (x text[])`,
+    sql`insert into x(x) values (('a', 'b'))`,
+  ]).catch(e => e)
+
+  return ['transformAssignedExpr', routine]
+})
 
 t('Catches connection config errors', async() => {
   const sql = postgres({ ...options, user: { toString: () => { throw new Error('wat') } }, database: 'prut' })