@saltcorn/postgres 1.3.1-beta.9 → 1.4.0-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saltcorn/postgres",
-  "version": "1.3.1-beta.9",
+  "version": "1.4.0-beta.0",
   "description": "Postgres structures for Saltcorn, open-source no-code platform",
   "homepage": "https://saltcorn.com",
   "scripts": {
@@ -12,8 +12,8 @@
   "license": "MIT",
   "main": "index.js",
   "dependencies": {
-    "@saltcorn/db-common": "1.3.1-beta.9",
-    "@saltcorn/plain-date": "0.1.4",
+    "@saltcorn/db-common": "1.4.0-beta.0",
+    "@saltcorn/plain-date": "0.2.0",
     "pg": "^8.13.1",
     "pg-copy-streams": "^6.0.6",
     "replacestream": "4.0.3"

package/postgres.js

@@ -142,7 +142,7 @@ const drop_reset_schema = async (schema) => {
  * @param {object} - whereObj - where object
  * @returns {Promise<number>} count of tables
  */
-const count = async (tbl, whereObj) => {
+const count = async (tbl, whereObj, opts) => {
   const { where, values } = mkWhere(whereObj);
   if (!where) {
     try {
@@ -156,9 +156,9 @@ const count = async (tbl, whereObj) => {
       / pg_catalog.current_setting('block_size')::int)
        )::bigint
 FROM   pg_catalog.pg_class c
-WHERE  c.oid = '"${getTenantSchema()}"."${sqlsanitize(tbl)}"'::regclass`;
+WHERE  c.oid = '"${opts?.schema || getTenantSchema()}"."${sqlsanitize(tbl)}"'::regclass`;
       sql_log(sql);
-      const tq = await getMyClient().query(sql, []);
+      const tq = await getMyClient(opts).query(sql, []);
       const n = +tq.rows[0].int8;
       if (n && n > 10000) return n;
     } catch {
@@ -166,11 +166,11 @@ WHERE  c.oid = '"${getTenantSchema()}"."${sqlsanitize(tbl)}"'::regclass`;
     }
   }
 
-  const sql = `SELECT COUNT(*) FROM "${getTenantSchema()}"."${sqlsanitize(
+  const sql = `SELECT COUNT(*) FROM "${opts?.schema || getTenantSchema()}"."${sqlsanitize(
     tbl
   )}" ${where}`;
   sql_log(sql, values);
-  const tq = await getMyClient().query(sql, values);
+  const tq = await getMyClient(opts).query(sql, values);
 
   return parseInt(tq.rows[0].count);
 };
@@ -201,7 +201,7 @@ const getVersion = async (short) => {
  */
 const deleteWhere = async (tbl, whereObj, opts = Object.create(null)) => {
   const { where, values } = mkWhere(whereObj);
-  const sql = `delete FROM "${getTenantSchema()}"."${sqlsanitize(
+  const sql = `delete FROM "${opts.schema || getTenantSchema()}"."${sqlsanitize(
     tbl
   )}" ${where}`;
   sql_log(sql, values);
@@ -281,10 +281,23 @@ const update = async (tbl, obj, id, opts = Object.create(null)) => {
   let valList = kvs.map(([k, v]) => v);
   // TBD check that is correct - because in insert function opts.noid ? "*" : opts.pk_name || "id"
   //valList.push(id === "undefined"? obj[opts.pk_name]: id);
-  valList.push(id === "undefined" ? obj[opts.pk_name || "id"] : id);
-  const q = `update "${getTenantSchema()}"."${sqlsanitize(
+  let whereS;
+  if (id && typeof id == "object") {
+    let n = kvs.length + 1;
+    const whereStrs = [];
+    Object.keys(id).forEach((k) => {
+      valList.push(id[k]);
+      whereStrs.push(`"${k}"=$${n}`);
+      n += 1;
+    });
+    whereS = whereStrs.join(" and ");
+  } else {
+    valList.push(id === "undefined" ? obj[opts.pk_name || "id"] : id);
+    whereS = `${ppPK(opts.pk_name)}=$${kvs.length + 1}`;
+  }
+  const q = `update "${opts.schema || getTenantSchema()}"."${sqlsanitize(
     tbl
-  )}" set ${assigns} where ${ppPK(opts.pk_name)}=$${kvs.length + 1}`;
+  )}" set ${assigns} where ${whereS}`;
   sql_log(q, valList);
   await getMyClient(opts).query(q, valList);
 };