Fixes

buildcore-io · May 13, 2024 · 99ad7d7 · 99ad7d7
1 parent e5fb59c
commit 99ad7d7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/packages/database/src/pg/impl/postgres.ts b/packages/database/src/pg/impl/postgres.ts
@@ -624,9 +624,12 @@ export class PgRunTransaction implements ITransaction {
     }
     try {
       return await docRef.useTransaction(this.trx, (doc) => doc.get());
-    } catch {
-      this.allLocksAquired = false;
-      return await docRef.get();
+    } catch (err: any) {
+      if (err.name === 'KnexTimeoutError') {
+        this.allLocksAquired = false;
+        return await docRef.get();
+      }
+      throw err;
     }
   };
 

diff --git a/packages/database/src/pg/interfaces/document/document.ts b/packages/database/src/pg/interfaces/document/document.ts
@@ -29,7 +29,7 @@ export class IDocument<C, B extends BaseRecord, U extends Update> {
   createQuery = () => {
     let query = this.con(this.table).where(this.pKey);
     if (this.con.isTransaction) {
-      query.forUpdate().noWait();
+      query.forUpdate().timeout(200);
     }
     return query;
   };