From 9ccb398046da0f32229c10c499387cb0179d4ad6 Mon Sep 17 00:00:00 2001
From: Dominik <dominik@do.vision>
Date: Tue, 1 Sep 2026 21:16:44 +0200
Subject: [PATCH] fix: prevent UNSAFE_TRANSACTION under concurrent sql.begin()

---
 src/connection.js       |  10 ++--
 src/index.js            |   5 ++
 tests/race-condition.js | 101 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 113 insertions(+), 3 deletions(-)
 create mode 100644 tests/race-condition.js

diff --git a/src/connection.js b/src/connection.js
index 1b1cccde..df5e7149 100644
--- a/src/connection.js
+++ b/src/connection.js
@@ -170,11 +170,15 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose
         : (query = q, query.active = true)
 
       build(q)
-      return write(toBuffer(q))
+      const written = write(toBuffer(q))
+      if (written && q.options.onexecute) {
+        q.options.onexecute(connection)
+        return false
+      }
+      return written
         && !q.describeFirst
         && !q.cursorFn
         && sent.length < max_pipeline
-        && (!q.options.onexecute || q.options.onexecute(connection))
     } catch (error) {
       sent.length === 0 && write(Sync)
       errored(error)
@@ -295,7 +299,7 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose
 
   /* c8 ignore next 3 */
   function drain() {
-    !query && onopen(connection)
+    !query && !connection.reserved && onopen(connection)
   }
 
   function data(x) {
diff --git a/src/index.js b/src/index.js
index c7fba3da..c9eae611 100644
--- a/src/index.js
+++ b/src/index.js
@@ -336,6 +336,11 @@ function Postgres(a, b) {
     if (closed.length)
       return connect(closed.shift(), query)
 
+    if (query.options.onexecute) {
+      queries.push(query)
+      return
+    }
+
     busy.length
       ? go(busy.shift(), query)
       : queries.push(query)
diff --git a/tests/race-condition.js b/tests/race-condition.js
new file mode 100644
index 00000000..0357d306
--- /dev/null
+++ b/tests/race-condition.js
@@ -0,0 +1,101 @@
+// Reproduces UNSAFE_TRANSACTION under concurrent sql.begin().
+// See https://github.com/porsager/postgres/issues/823
+
+import postgres from "../src/index.js";
+
+const delay = (ms) => new Promise((r) => setTimeout(r, ms));
+
+const pgOptions = {
+  db: "postgres_js_test",
+  user: "postgres_js_test",
+  idle_timeout: null,
+  connect_timeout: 10,
+};
+
+async function canConnect() {
+  return new Promise((resolve) => {
+    const sql = postgres({ ...pgOptions, max: 1 });
+    sql`SELECT 1`
+      .then(() => sql.end().then(() => resolve(true)))
+      .catch(() => {
+        sql.end({ timeout: 0 }).catch(() => {});
+        resolve(false);
+      });
+  });
+}
+
+const ITERATIONS = 20;
+
+async function runOnce() {
+  const errors = [];
+  const sql = postgres({ ...pgOptions, max: 3, max_pipeline: 2 });
+
+  try {
+    await sql`SELECT 1`;
+
+    const blockers = Array.from({ length: 3 }, () =>
+      sql`SELECT pg_sleep(0.5)`.catch((e) => { errors.push(e); return e; }),
+    );
+    await delay(10);
+
+    const queries = Array.from({ length: 6 }, (_, i) =>
+      sql`SELECT ${i}::int`.catch((e) => { errors.push(e); return e; }),
+    );
+    const begins = Array.from({ length: 5 }, (_, i) =>
+      sql.begin(async (tx) => {
+        await tx`SELECT ${i}::int as n`;
+        return "ok";
+      }).catch((e) => { errors.push(e); return e; }),
+    );
+
+    await Promise.allSettled([
+      ...blockers,
+      ...queries.map((p) => Promise.race([p, delay(10000).then(() => { throw new Error("timeout"); })])),
+      ...begins.map((p) => Promise.race([p, delay(10000).then(() => { throw new Error("timeout"); })])),
+    ]);
+  } finally {
+    await sql.end({ timeout: 2 }).catch(() => {});
+  }
+
+  return errors.filter((e) => e.code === "UNSAFE_TRANSACTION").length;
+}
+
+async function run() {
+  console.log("\n  Race Condition Test");
+  console.log(`  Running scenario ${ITERATIONS} times to expose the race\n`);
+
+  const dbAvailable = await canConnect();
+  if (!dbAvailable) {
+    console.log("  SKIP: PostgreSQL not available (need postgres_js_test db/user)");
+    console.log("  Set up with: createuser postgres_js_test && createdb -O postgres_js_test postgres_js_test\n");
+    process.exit(1);
+  }
+
+  let totalUnsafe = 0;
+  let iterationsWithErrors = 0;
+
+  for (let i = 0; i < ITERATIONS; i++) {
+    const count = await runOnce();
+    if (count > 0) {
+      iterationsWithErrors++;
+      totalUnsafe += count;
+      process.stdout.write("\x1b[31mF\x1b[0m");
+    } else {
+      process.stdout.write("\x1b[32m.\x1b[0m");
+    }
+  }
+  console.log("");
+
+  if (totalUnsafe > 0) {
+    console.log(`\n  \x1b[31mFAIL\x1b[0m ${totalUnsafe} UNSAFE_TRANSACTION error(s) across ${iterationsWithErrors}/${ITERATIONS} iterations\n`);
+    process.exit(1);
+  } else {
+    console.log(`\n  \x1b[32mPASS\x1b[0m No UNSAFE_TRANSACTION errors across ${ITERATIONS} iterations\n`);
+    process.exit(0);
+  }
+}
+
+run().catch((e) => {
+  console.error(e);
+  process.exit(1);
+});