@saltcorn/postgres 1.5.0-beta.1 → 1.5.0-beta.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saltcorn/postgres",
-  "version": "1.5.0-beta.1",
+  "version": "1.5.0-beta.10",
   "description": "Postgres structures for Saltcorn, open-source no-code platform",
   "homepage": "https://saltcorn.com",
   "scripts": {
@@ -12,7 +12,7 @@
   "license": "MIT",
   "main": "index.js",
   "dependencies": {
-    "@saltcorn/db-common": "1.5.0-beta.1",
+    "@saltcorn/db-common": "1.5.0-beta.10",
     "@saltcorn/plain-date": "0.2.5",
     "pg": "^8.13.1",
     "pg-copy-streams": "^6.0.6",

package/postgres.js

@@ -166,9 +166,14 @@ WHERE  c.oid = '"${opts?.schema || getTenantSchema()}"."${sqlsanitize(tbl)}"'::r
     }
   }
 
-  const sql = `SELECT COUNT(*) FROM "${opts?.schema || getTenantSchema()}"."${sqlsanitize(
+  const core_sql = `FROM "${opts?.schema || getTenantSchema()}"."${sqlsanitize(
     tbl
   )}" ${where}`;
+  //https://pganalyze.com/blog/5mins-postgres-limited-count
+  const sql = opts?.limit
+    ? `SELECT count(*) AS count FROM (
+  SELECT 1 ${core_sql} limit ${+opts?.limit}) limited_count`
+    : `SELECT COUNT(*) ${core_sql}`;
   sql_log(sql, values);
   const tq = await getMyClient(opts).query(sql, values);
 
@@ -632,6 +637,48 @@ const tryCatchInTransaction = async (f, onError) => {
   }
 };
 
+/**
+ * Should be used for code that is sometimes called from within a withTransaction block
+ * and sometimes not.
+ * @param {Function} f logic to execute
+ * @param {Function} onError error handler
+ * @returns
+ */
+const openOrUseTransaction = async (f, onError) => {
+  const reqCon = getRequestContext();
+  if (reqCon?.client) return await f();
+  else return await withTransaction(f, onError);
+};
+
+/**
+ * Wait some time until current transaction COMMITs,
+ * then open another transaction.
+ * @param {Function} f logic to execute
+ * @param {Function} onError error handler
+ * @returns
+ */
+const whenTransactionisFree = (f, onError) => {
+  return new Promise((resolve, reject) => {
+    // wait until transaction is free
+    let counter = 0;
+    const interval = setInterval(async () => {
+      const reqCon = getRequestContext();
+      if (!reqCon?.client) {
+        clearInterval(interval);
+        try {
+          resolve(await withTransaction(f, onError));
+        } catch (e) {
+          reject(e);
+        }
+      }
+      if (++counter > 100) {
+        clearInterval(interval);
+        reject(new Error("Timeout waiting for transaction to be free"));
+      }
+    }, 200);
+  });
+};
+
 const query = (text, params) => {
   sql_log(text, params);
   return getMyClient().query(text, params);
@@ -682,6 +729,8 @@ const postgresExports = {
   truncate,
   withTransaction,
   tryCatchInTransaction,
+  openOrUseTransaction,
+  whenTransactionisFree,
   commitAndBeginNewTransaction,
 };