fix: catch not released tx

zetxx · Dec 21, 2023 · fd40049 · fd40049
1 parent 38f20c8
commit fd40049
Showing 1 changed file with 15 additions and 11 deletions.
diff --git a/lib/postgres/index.js b/lib/postgres/index.js
@@ -106,24 +106,27 @@ module.exports = async(config) => {
                             }
                             return arguments[name];
                         });
-                        if (!txId) {
-                            const res = await link.query(`SELECT * FROM ${sqlName}(${fillArgs})`, dynArgs);
+                        try {
+                            if (!txId) {
+                                const res = await link.query(`SELECT * FROM ${sqlName}(${fillArgs})`, dynArgs);
+                                return res;
+                            }
+                            if (!txMap.get(txId)) {
+                                throw SqlSe.create(
+                                    'transactionIdNotFound',
+                                    {fn: jsName, argument: name, txId}
+                                );
+                            }
+                            const res = await txMap.get(txId).query(`SELECT * FROM ${sqlName}(${fillArgs})`, dynArgs);
                             return res;
+                        } catch (e) {
+                            throw e;
                         }
-                        if (!txMap.get(txId)) {
-                            throw SqlSe.create(
-                                'transactionIdNotFound',
-                                {fn: jsName, argument: name, txId}
-                            );
-                        }
-                        const res = await txMap.get(txId).query(`SELECT * FROM ${sqlName}(${fillArgs})`, dynArgs);
-                        return res;
                     }
                 };
             }, {});
     };
     const methods = await build();
-
     return {
         methods,
         async stop() {
@@ -145,6 +148,7 @@ module.exports = async(config) => {
         async txEnd(id, action) {
             const client = txMap.get(id);
             await client.query(action);
+            client.release();
             txMap.delete(id);
         }
     };