Properly check if prepared

porsager · Mar 20, 2024 · f82ca1b · f82ca1b
1 parent 6f20f3f
commit f82ca1b
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 9 deletions.
diff --git a/cjs/src/connection.js b/cjs/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 && query.prepare && retryRoutines.has(error.routine)
+      : query && query.prepared && retryRoutines.has(error.routine)
         ? retry(query, error)
         : errored(error)
   }

diff --git a/cjs/tests/index.js b/cjs/tests/index.js
@@ -1789,14 +1789,14 @@ t('Recreate prepared statements on RevalidateCachedQuery error', async() => {
   ]
 })
 
-t('Properly throws routing error on not prepared statements', async() => {
+t('Properly throws routine 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() => {
+t('Properly throws routine 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'))`,
@@ -1805,6 +1805,15 @@ t('Properly throws routing error on not prepared statements in transaction', asy
   return ['transformAssignedExpr', routine]
 })
 
+t('Properly throws routine error on not prepared statements using file', async() => {
+  const { routine } = await sql.unsafe(`
+    create table x (x text[]);
+    insert into x(x) values (('a', 'b'));
+  `, { prepare: true }).catch(e => e)
+
+  return ['transformAssignedExpr', routine]
+})
+
 t('Catches connection config errors', async() => {
   const sql = postgres({ ...options, user: { toString: () => { throw new Error('wat') } }, database: 'prut' })
 

diff --git a/deno/src/connection.js b/deno/src/connection.js
@@ -791,7 +791,7 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose
     const error = Errors.postgres(parseError(x))
     query && query.retried
       ? errored(query.retried)
-      : query && query.prepare && retryRoutines.has(error.routine)
+      : query && query.prepared && retryRoutines.has(error.routine)
         ? retry(query, error)
         : errored(error)
   }

diff --git a/deno/tests/index.js b/deno/tests/index.js
@@ -1791,14 +1791,14 @@ t('Recreate prepared statements on RevalidateCachedQuery error', async() => {
   ]
 })
 
-t('Properly throws routing error on not prepared statements', async() => {
+t('Properly throws routine 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() => {
+t('Properly throws routine 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'))`,
@@ -1807,6 +1807,15 @@ t('Properly throws routing error on not prepared statements in transaction', asy
   return ['transformAssignedExpr', routine]
 })
 
+t('Properly throws routine error on not prepared statements using file', async() => {
+  const { routine } = await sql.unsafe(`
+    create table x (x text[]);
+    insert into x(x) values (('a', 'b'));
+  `, { prepare: true }).catch(e => e)
+
+  return ['transformAssignedExpr', routine]
+})
+
 t('Catches connection config errors', async() => {
   const sql = postgres({ ...options, user: { toString: () => { throw new Error('wat') } }, database: 'prut' })
 

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 && query.prepare && retryRoutines.has(error.routine)
+      : query && query.prepared && retryRoutines.has(error.routine)
         ? retry(query, error)
         : errored(error)
   }

diff --git a/tests/index.js b/tests/index.js
@@ -1789,14 +1789,14 @@ t('Recreate prepared statements on RevalidateCachedQuery error', async() => {
   ]
 })
 
-t('Properly throws routing error on not prepared statements', async() => {
+t('Properly throws routine 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() => {
+t('Properly throws routine 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'))`,
@@ -1805,6 +1805,15 @@ t('Properly throws routing error on not prepared statements in transaction', asy
   return ['transformAssignedExpr', routine]
 })
 
+t('Properly throws routine error on not prepared statements using file', async() => {
+  const { routine } = await sql.unsafe(`
+    create table x (x text[]);
+    insert into x(x) values (('a', 'b'));
+  `, { prepare: true }).catch(e => e)
+
+  return ['transformAssignedExpr', routine]
+})
+
 t('Catches connection config errors', async() => {
   const sql = postgres({ ...options, user: { toString: () => { throw new Error('wat') } }, database: 'prut' })