@happyvertical/sql 0.80.5 → 0.80.6

package/dist/index.js

@@ -2666,6 +2666,41 @@ async function createDatabase(options, cacheKey) {
 			}
 		}
 	};
+	let savepointSequence = 0;
+	/**
+	* Builds the `transaction` exposed on a transaction-scoped interface.
+	*
+	* Re-entering runs the callback under a SAVEPOINT on the *same* connection,
+	* which is what callers assume nesting already did. Re-exposing the top-level
+	* `transaction` here (the previous behaviour) checked out a second pooled
+	* connection and began an independent transaction, so the nested work could
+	* not see the enclosing transaction's uncommitted rows, and if the enclosing
+	* transaction held a lock the nested one needed, the two deadlocked in a way
+	* PostgreSQL cannot detect: the outer connection is blocked on a promise
+	* rather than on a lock, so `deadlock_timeout` never fires and the process
+	* hangs until some unrelated timeout.
+	*
+	* @param txClient - The client running the enclosing transaction
+	* @param scopeFor - Builds the interface handed to the nested callback
+	*/
+	const createNestedTransaction = (txClient, scopeFor) => {
+		return async (callback) => {
+			savepointSequence += 1;
+			const name = `hv_sp_${savepointSequence}`;
+			await txClient.query(`SAVEPOINT ${name}`);
+			try {
+				const result = await callback(scopeFor());
+				await txClient.query(`RELEASE SAVEPOINT ${name}`);
+				return result;
+			} catch (error) {
+				try {
+					await txClient.query(`ROLLBACK TO SAVEPOINT ${name}`);
+					await txClient.query(`RELEASE SAVEPOINT ${name}`);
+				} catch {}
+				throw error;
+			}
+		};
+	};
 	/**
 	* Executes a callback within a database transaction
 	* Automatically commits on success or rolls back on error
@@ -2806,7 +2841,7 @@ async function createDatabase(options, cacheKey) {
 				},
 				tableExists,
 				syncSchema,
-				transaction
+				transaction: createNestedTransaction(txClient, () => txDb)
 			};
 			const result = await callback(txDb);
 			await txClient.query("COMMIT");
@@ -2980,7 +3015,7 @@ async function createDatabase(options, cacheKey) {
 			},
 			tableExists,
 			syncSchema,
-			transaction,
+			transaction: createNestedTransaction(txClient, () => txHandle),
 			commit,
 			rollback,
 			isActive