@dbsp/adapter-pgsql 3.5.0 → 3.5.1

package/dist/index.js

@@ -23035,8 +23035,10 @@ var PreparedStatementRegistry = class {
   collisionRejectedFingerprints = /* @__PURE__ */ new Set();
   nextGeneration = 0;
   /**
-   * Reserves a name only from the second sighting onward. Call confirm after
-   * successful named execution, or abort when that execution fails.
+   * Reserves a name only from the second sighting onward. Call confirm to commit
+   * executor-scoped admission after a successful named execution or a
+   * caller-classified positionless protocol-shaped failure. Call abort for a
+   * local, position-bearing, collision, or verified infrastructure failure.
    */
   admit(sql) {
     const fingerprint = derivePreparedStatementFingerprint(sql);
@@ -23071,7 +23073,7 @@ var PreparedStatementRegistry = class {
     if (this.atCapacity()) this.candidates.clear();
     return reservation;
   }
-  /** Confirms a reservation only after PostgreSQL accepted its named execution. */
+  /** Commits executor-scoped admission after a successful named execution or a caller-classified server-reported failure. */
   confirm(reservation) {
     const pending = this.pendingByFingerprint.get(reservation.fingerprint);
     if (pending === void 0 || pending.name !== reservation.name || !pending.generations.has(reservation.generation))
@@ -23079,7 +23081,7 @@ var PreparedStatementRegistry = class {
     this.pendingByFingerprint.delete(reservation.fingerprint);
     this.namesByFingerprint.set(reservation.fingerprint, reservation.name);
   }
-  /** Aborts only this still-pending attempt, never a later confirmation. */
+  /** Aborts only this still-pending attempt after a caller-classified failure that never reached server acceptance, never a later confirmation. */
   abort(reservation) {
     const pending = this.pendingByFingerprint.get(reservation.fingerprint);
     if (pending === void 0 || pending.name !== reservation.name || !pending.generations.delete(reservation.generation))
@@ -23458,25 +23460,30 @@ function isDriverLocalPreparedStatementNameCollision(error, attemptedName) {
   return error instanceof Error && !("code" in error) && error.message === message;
 }
 function isVerifiedPreparedStatementInfrastructureError(error) {
+  if (!hasPostgresSqlStateCode(error)) return false;
   if (typeof error !== "object" || error === null) return false;
   const { code, routine } = error;
   return code === "0A000" && routine === "RevalidateCachedQuery" || code === "26000" && routine === "FetchPreparedStatement" || code === "42P05" && routine === "StorePreparedStatement";
 }
-function didNamedExecutionReachExecution(error) {
+function isPositionlessProtocolShapedFailure(error) {
+  return hasPostgresSqlStateCode(error) && error.position === void 0 && !isVerifiedPreparedStatementInfrastructureError(error);
+}
+function hasPostgresSqlStateCode(error) {
   if (typeof error !== "object" || error === null) return false;
-  const { code, position } = error;
-  return typeof code === "string" && /^[0-9A-Z]{5}$/.test(code) && position === void 0 && !isVerifiedPreparedStatementInfrastructureError(error);
+  const { code, severity } = error;
+  return typeof severity === "string" && typeof code === "string" && /^[0-9A-Z]{5}$/.test(code);
 }
 function shouldAbortPreparedStatementReservation(error, executor, attemptedName) {
   if (typeof error === "object" && error !== null && "position" in error && error.position !== void 0)
     return true;
   if (isDriverLocalPreparedStatementNameCollision(error, attemptedName))
     return true;
-  if (!isPoolClientLike(executor)) return false;
-  if (didNamedExecutionReachExecution(error)) return false;
-  return !(error instanceof Error && error.message.startsWith("Prepared statements must be unique - '"));
+  if (!isPoolClientLike(executor)) return !hasPostgresSqlStateCode(error);
+  if (isPositionlessProtocolShapedFailure(error)) return false;
+  return true;
 }
 function isVerifiedClientWidePreparedStatementLoss(error) {
+  if (!hasPostgresSqlStateCode(error)) return false;
   if (typeof error !== "object" || error === null) return false;
   const { code, routine } = error;
   return code === "26000" && routine === "FetchPreparedStatement";
@@ -27649,20 +27656,34 @@ var PgsqlAdapter = class {
         return result;
       } catch (error) {
         if (admission.reservation !== void 0) {
-          if (shouldAbortPreparedStatementReservation(
+          try {
+            if (shouldAbortPreparedStatementReservation(
+              error,
+              executor,
+              admission.name
+            )) {
+              this.preparedStatementRegistry.abort(admission.reservation);
+            } else
+              this.preparedStatementRegistry.confirm(admission.reservation);
+          } catch {
+            try {
+              this.preparedStatementRegistry.abort(admission.reservation);
+            } catch {
+            }
+          }
+        }
+        try {
+          if (isPoolClientLike(executor) && (isVerifiedPreparedStatementInfrastructureError(error) || isDriverLocalPreparedStatementNameCollision(
             error,
-            executor,
             admission.name
-          )) {
-            this.preparedStatementRegistry.abort(admission.reservation);
-          } else this.preparedStatementRegistry.confirm(admission.reservation);
-        }
-        if (isPoolClientLike(executor) && (isVerifiedPreparedStatementInfrastructureError(error) || isDriverLocalPreparedStatementNameCollision(error, admission.name))) {
-          quarantinePreparedStatement(
-            executor,
-            sql,
-            isVerifiedClientWidePreparedStatementLoss(error)
-          );
+          ))) {
+            quarantinePreparedStatement(
+              executor,
+              sql,
+              isVerifiedClientWidePreparedStatementLoss(error)
+            );
+          }
+        } catch {
         }
         throw error;
       }