@saltcorn/data 0.6.1-beta.0 → 0.6.1

package/tests/exact_views.test.js

@@ -128,7 +128,7 @@ describe("Show view", () => {
           configuration: { code: 'console.log("1")' },
         },
       ],
-      response: `<div class="row"><div class="col-6">1</div><div class="col-6"><a href="javascript:view_post('testshow', 'run_action', {rndid:'1a8ac3', id:1});" class="btn btn-success btn-sm">you're my number</a></div></div>`,
+      response: `<div class="row w-100"><div class="col-6">1</div><div class="col-6"><a href="javascript:view_post('testshow', 'run_action', {rndid:'1a8ac3', id:1});" class="btn btn-success btn-sm">you're my number</a></div></div>`,
     });
     await test_show({
       layout: {
@@ -179,7 +179,7 @@ describe("Show view", () => {
           in_modal: true,
         },
       ],
-      response: `<div class="row"><div class="col-6"><div class="card mt-4 shadow"><div class="card-body"><button class="btn btn-link" onClick="ajax_modal('/view/authorshow?id=1')">foo it</button></div></div></div><div class="col-6"><div class="text-left" style="min-height: 100px;border: 1px solid black;  background-color: #a9a7a7;  "><a href="https://countto.com/967">Herman Melville</a></div></div></div>`,
+      response: `<div class="row w-100"><div class="col-6"><div class="card mt-4 shadow"><div class="card-body"><button class="btn btn-link" onClick="ajax_modal('/view/authorshow?id=1')">foo it</button></div></div></div><div class="col-6"><div class="text-left" style="min-height: 100px;border: 1px solid black;  background-color: #a9a7a7;  "><a href="https://countto.com/967">Herman Melville</a></div></div></div>`,
     });
     await test_show({
       layout: {
@@ -287,13 +287,13 @@ describe("Edit view", () => {
     await test_edit({
       layout,
       columns,
-      response: `<form action="/view/testedit" class="form-namespace " method="post"><input type="hidden" name="_csrf" value=""><div class="row"><div class="col-2">Name</div><div class="col-10"><input type="text" class="form-control  " data-fieldname="name" name="name" id="inputname"></div></div><br /><div class="row"><div class="col-2">Favourite book</div><div class="col-10"><select class="form-control   " data-fieldname="favbook" name="favbook" id="inputfavbook"><option value=""></option><option value="1">Herman Melville</option><option value="2">Leo Tolstoy</option></select></div></div><br /><div class="row"><div class="col-2">Parent</div><div class="col-10"><select class="form-control   " data-fieldname="parent" name="parent" id="inputparent"><option value=""></option><option value="1">1</option><option value="2">2</option></select></div></div><br /><button type="submit" class="btn btn-primary ">Save</button></form>`,
+      response: `<form action="/view/testedit" class="form-namespace " method="post"><input type="hidden" name="_csrf" value=""><div class="row w-100"><div class="col-2">Name</div><div class="col-10"><input type="text" class="form-control  " data-fieldname="name" name="name" id="inputname"></div></div><br /><div class="row w-100"><div class="col-2">Favourite book</div><div class="col-10"><select class="form-control   " data-fieldname="favbook" name="favbook" id="inputfavbook"><option value=""></option><option value="1">Herman Melville</option><option value="2">Leo Tolstoy</option></select></div></div><br /><div class="row w-100"><div class="col-2">Parent</div><div class="col-10"><select class="form-control   " data-fieldname="parent" name="parent" id="inputparent"><option value=""></option><option value="1">1</option><option value="2">2</option></select></div></div><br /><button type="submit" class="btn btn-primary ">Save</button></form>`,
     });
     await test_edit({
       id: 1,
       layout,
       columns,
-      response: `<form action="/view/testedit" class="form-namespace " method="post"><input type="hidden" name="_csrf" value=""><input type="hidden" class="form-control  " name="id" value="1"><div class="row"><div class="col-2">Name</div><div class="col-10"><input type="text" class="form-control  " data-fieldname="name" name="name" id="inputname" value="Kirk Douglas"></div></div><br /><div class="row"><div class="col-2">Favourite book</div><div class="col-10"><select class="form-control   " data-fieldname="favbook" name="favbook" id="inputfavbook"><option value=""></option><option value="1" selected>Herman Melville</option><option value="2">Leo Tolstoy</option></select></div></div><br /><div class="row"><div class="col-2">Parent</div><div class="col-10"><select class="form-control   " data-fieldname="parent" name="parent" id="inputparent"><option value=""></option><option value="1">1</option><option value="2">2</option></select></div></div><br /><button type="submit" class="btn btn-primary ">Save</button></form>`,
+      response: `<form action="/view/testedit" class="form-namespace " method="post"><input type="hidden" name="_csrf" value=""><input type="hidden" class="form-control  " name="id" value="1"><div class="row w-100"><div class="col-2">Name</div><div class="col-10"><input type="text" class="form-control  " data-fieldname="name" name="name" id="inputname" value="Kirk Douglas"></div></div><br /><div class="row w-100"><div class="col-2">Favourite book</div><div class="col-10"><select class="form-control   " data-fieldname="favbook" name="favbook" id="inputfavbook"><option value=""></option><option value="1" selected>Herman Melville</option><option value="2">Leo Tolstoy</option></select></div></div><br /><div class="row w-100"><div class="col-2">Parent</div><div class="col-10"><select class="form-control   " data-fieldname="parent" name="parent" id="inputparent"><option value=""></option><option value="1">1</option><option value="2">2</option></select></div></div><br /><button type="submit" class="btn btn-primary ">Save</button></form>`,
     });
   });
 });
@@ -394,7 +394,7 @@ describe("Filter view", () => {
       ],
       viewname: "testfilter",
       response:
-        '<div class="row"><div class="col-6"><select name="ddfilterpatients.favbook.name" class="form-control d-inline" style="width: unset;" onchange="this.value==\'\' ? unset_state_field(\'patients.favbook.name\'): set_state_field(\'patients.favbook.name\', this.value)"><option value="" class="text-muted"></option><option value="Kirk Douglas">Kirk Douglas</option><option value="Michael Douglas">Michael Douglas</option></select></div><div class="col-6"><button class="btn btn-outline-primary" onClick="set_state_field(\'pages\', \'13\')">thirteen</button></div></div><button class="btn btn-outline-primary" onClick="set_state_field(\'patients.favbook.name\', \'Jim\')">Jim</button><select name="ddfilterauthor" class="form-control d-inline" style="width: unset;" onchange="this.value==\'\' ? unset_state_field(\'author\'): set_state_field(\'author\', this.value)"><option value="" class="text-muted"></option><option value="Herman Melville">Herman Melville</option><option value="Leo Tolstoy">Leo Tolstoy</option></select>',
+        '<div class="row w-100"><div class="col-6"><select name="ddfilterpatients.favbook.name" class="form-control d-inline" style="width: unset;" onchange="this.value==\'\' ? unset_state_field(\'patients.favbook.name\'): set_state_field(\'patients.favbook.name\', this.value)"><option value="" class="text-muted"></option><option value="Kirk Douglas">Kirk Douglas</option><option value="Michael Douglas">Michael Douglas</option></select></div><div class="col-6"><button class="btn btn-outline-primary" onClick="set_state_field(\'pages\', \'13\')">thirteen</button></div></div><button class="btn btn-outline-primary" onClick="set_state_field(\'patients.favbook.name\', \'Jim\')">Jim</button><select name="ddfilterauthor" class="form-control d-inline" style="width: unset;" onchange="this.value==\'\' ? unset_state_field(\'author\'): set_state_field(\'author\', this.value)"><option value="" class="text-muted"></option><option value="Herman Melville">Herman Melville</option><option value="Leo Tolstoy">Leo Tolstoy</option></select>',
     });
   });
 });

package/utils.js

@@ -1,3 +1,7 @@
+/**
+ * @category saltcorn-data
+ * @module utils
+ */
 const v8 = require("v8");
 const fs = require("fs");
 

package/db/internal.js

@@ -1,229 +0,0 @@
-const { footer } = require("@saltcorn/markup/tags");
-const { contract, is } = require("contractis");
-const { is_sqlite } = require("./connect");
-
-//https://stackoverflow.com/questions/15300704/regex-with-my-jquery-function-for-sql-variable-name-validation
-/**
- * Transform value to correct sql name.
- * Note! Dont use other symbols than ^A-Za-z_0-9
- * @type {*|(function(...[*]=): *)}
- */
-const sqlsanitize = contract(is.fun(is.str, is.str), (nm) => {
-  const s = nm.replace(/[^A-Za-z_0-9]*/g, "");
-  if (s[0] >= "0" && s[0] <= "9") return `_${s}`;
-  else return s;
-});
-/**
- * Transform value to correct sql name.
- * Instead of sqlsanitize also allows .
- * For e.g. table name
- * Note! Dont use other symbols than ^A-Za-z_0-9.
- * @type {*|(function(...[*]=): *)}
- */
-const sqlsanitizeAllowDots = contract(is.fun(is.str, is.str), (nm) => {
-  const s = nm.replace(/[^A-Za-z_0-9."]*/g, "");
-  if (s[0] >= "0" && s[0] <= "9") return `_${s}`;
-  else return s;
-});
-/**
- *
- * @param v
- * @param i
- * @param is_sqlite
- * @returns {`to_tsvector('english', ${*}) @@ plainto_tsquery('english', $${string})`|`${*} LIKE '%' || ? || '%'`}
- */
-const whereFTS = (v, i, is_sqlite) => {
-  const { fields, table } = v;
-  var flds = fields
-    .filter((f) => f.type && f.type.sql_name === "text")
-    .map(
-      (f) =>
-        "coalesce(" +
-        (table
-          ? `"${sqlsanitize(table)}"."${sqlsanitize(f.name)}"`
-          : `"${sqlsanitize(f.name)}"`) +
-        ",'')"
-    )
-    .join(" || ' ' || ");
-  if (flds === "") flds = "''";
-  if (is_sqlite) return `${flds} LIKE '%' || ? || '%'`;
-  else
-    return `to_tsvector('english', ${flds}) @@ plainto_tsquery('english', $${i})`;
-};
-
-const placeHolder = (is_sqlite, i) => (is_sqlite ? `?` : `$${i}`);
-
-const mkCounter = () => {
-  let i = 0;
-  return () => {
-    i += 1;
-    return i;
-  };
-};
-const subSelectWhere = (is_sqlite, i) => (k, v) => {
-  const whereObj = v.inSelect.where;
-  const wheres = whereObj ? Object.entries(whereObj) : [];
-  const where =
-    whereObj && wheres.length > 0
-      ? "where " + wheres.map(whereClause(is_sqlite, i)).join(" and ")
-      : "";
-  return `${quote(sqlsanitizeAllowDots(k))} in (select ${
-    v.inSelect.field
-  } from ${v.inSelect.table} ${where})`;
-};
-const subSelectVals = (v) => {
-  const whereObj = v.inSelect.where;
-  const wheres = whereObj ? Object.entries(whereObj) : [];
-  const xs = wheres
-    .map(getVal)
-    .flat(1)
-    .filter((v) => v !== null);
-  return xs;
-};
-const wrapParens = (s) => (s ? `(${s})` : s);
-const quote = (s) => (s.includes(".") || s.includes('"') ? s : `"${s}"`);
-const whereOr = (is_sqlite, i) => (ors) =>
-  wrapParens(
-    ors
-      .map((vi) =>
-        Object.entries(vi)
-          .map((kv) => whereClause(is_sqlite, i)(kv))
-          .join(" and ")
-      )
-      .join(" or ")
-  );
-
-const whereClause = (is_sqlite, i) => ([k, v]) =>
-  k === "_fts"
-    ? whereFTS(v, i(), is_sqlite)
-    : typeof (v || {}).in !== "undefined"
-    ? `${quote(sqlsanitizeAllowDots(k))} = ${
-        is_sqlite ? "" : "ANY"
-      } (${placeHolder(is_sqlite, i())})`
-    : k === "or" && Array.isArray(v)
-    ? whereOr(is_sqlite, i)(v)
-    : k === "not" && typeof v === "object"
-    ? `not (${Object.entries(v)
-        .map((kv) => whereClause(is_sqlite, i)(kv))
-        .join(" and ")})`
-    : v && v.or && Array.isArray(v.or)
-    ? wrapParens(
-        v.or.map((vi) => whereClause(is_sqlite, i)([k, vi])).join(" or ")
-      )
-    : Array.isArray(v)
-    ? v.map((vi) => whereClause(is_sqlite, i)([k, vi])).join(" and ")
-    : typeof (v || {}).ilike !== "undefined"
-    ? `${quote(sqlsanitizeAllowDots(k))} ${
-        is_sqlite ? "LIKE" : "ILIKE"
-      } '%' || ${placeHolder(is_sqlite, i())} || '%'`
-    : typeof (v || {}).gt !== "undefined"
-    ? `${quote(sqlsanitizeAllowDots(k))}>${v.equal ? "=" : ""}${placeHolder(
-        is_sqlite,
-        i()
-      )}`
-    : typeof (v || {}).lt !== "undefined"
-    ? `${quote(sqlsanitizeAllowDots(k))}<${v.equal ? "=" : ""}${placeHolder(
-        is_sqlite,
-        i()
-      )}`
-    : typeof (v || {}).inSelect !== "undefined"
-    ? subSelectWhere(is_sqlite, i)(k, v)
-    : typeof (v || {}).json !== "undefined"
-    ? is_sqlite
-      ? `json_extract(${quote(
-          sqlsanitizeAllowDots(k)
-        )}, '$.${sqlsanitizeAllowDots(v.json[0])}')=${placeHolder(
-          is_sqlite,
-          i()
-        )}`
-      : `${quote(sqlsanitizeAllowDots(k))}->>'${sqlsanitizeAllowDots(
-          v.json[0]
-        )}'=${placeHolder(is_sqlite, i())}`
-    : v === null
-    ? `${quote(sqlsanitizeAllowDots(k))} is null`
-    : `${quote(sqlsanitizeAllowDots(k))}=${placeHolder(is_sqlite, i())}`;
-
-const getVal = ([k, v]) =>
-  k === "_fts"
-    ? v.searchTerm
-    : typeof (v || {}).in !== "undefined"
-    ? [v.in]
-    : k === "not" && typeof v === "object"
-    ? Object.entries(v).map(getVal).flat(1)
-    : k === "or" && Array.isArray(v)
-    ? v.map((vi) => Object.entries(vi).map(getVal)).flat(1)
-    : v && v.or && Array.isArray(v.or)
-    ? v.or.map((vi) => getVal([k, vi])).flat(1)
-    : Array.isArray(v)
-    ? v.map((vi) => getVal([k, vi])).flat(1)
-    : typeof (v || {}).ilike !== "undefined"
-    ? v.ilike
-    : typeof (v || {}).inSelect !== "undefined"
-    ? subSelectVals(v)
-    : typeof (v || {}).lt !== "undefined"
-    ? v.lt
-    : typeof (v || {}).gt !== "undefined"
-    ? v.gt
-    : typeof (v || {}).sql !== "undefined"
-    ? null
-    : typeof (v || {}).json !== "undefined"
-    ? v.json[1]
-    : v;
-
-const mkWhere = (whereObj, is_sqlite) => {
-  const wheres = whereObj ? Object.entries(whereObj) : [];
-  //console.log({ wheres });
-  const where =
-    whereObj && wheres.length > 0
-      ? "where " + wheres.map(whereClause(is_sqlite, mkCounter())).join(" and ")
-      : "";
-  const values = wheres
-    .map(getVal)
-    .flat(1)
-    .filter((v) => v !== null);
-  return { where, values };
-};
-
-const toInt = (x) =>
-  typeof x === "number"
-    ? Math.round(x)
-    : typeof x === "string"
-    ? parseInt(x)
-    : null;
-
-const getDistanceOrder = ({ latField, longField, lat, long }) => {
-  const cos_lat_2 = Math.pow(Math.cos((+lat * Math.PI) / 180), 2);
-  return `((${sqlsanitizeAllowDots(
-    latField
-  )} - ${+lat})*(${sqlsanitizeAllowDots(
-    latField
-  )} - ${+lat})) + ((${sqlsanitizeAllowDots(
-    longField
-  )} - ${+long})*(${sqlsanitizeAllowDots(longField)} - ${+long})*${cos_lat_2})`;
-};
-const mkSelectOptions = (selopts) => {
-  const orderby =
-    selopts.orderBy === "RANDOM()"
-      ? "order by RANDOM()"
-      : selopts.orderBy && selopts.orderBy.distance
-      ? `order by ${getDistanceOrder(selopts.orderBy.distance)}`
-      : selopts.orderBy && selopts.nocase
-      ? `order by lower(${sqlsanitizeAllowDots(selopts.orderBy)})${
-          selopts.orderDesc ? " DESC" : ""
-        }`
-      : selopts.orderBy
-      ? `order by ${sqlsanitizeAllowDots(selopts.orderBy)}${
-          selopts.orderDesc ? " DESC" : ""
-        }`
-      : "";
-  const limit = selopts.limit ? `limit ${toInt(selopts.limit)}` : "";
-  const offset = selopts.offset ? `offset ${toInt(selopts.offset)}` : "";
-  return [orderby, limit, offset].filter((s) => s).join(" ");
-};
-
-module.exports = {
-  sqlsanitize,
-  mkWhere,
-  mkSelectOptions,
-  sqlsanitizeAllowDots,
-};

package/db/multi-tenant.js

@@ -1,24 +0,0 @@
-const { AsyncLocalStorage } = require("async_hooks");
-const { sqlsanitize } = require("./internal");
-
-var is_multi_tenant = true;
-const is_it_multi_tenant = () => is_multi_tenant;
-
-const tenantNamespace = new AsyncLocalStorage();
-
-const enable_multi_tenant = () => {};
-
-const runWithTenant = (tenant, f) => {
-  if (!is_multi_tenant) return f();
-  else return tenantNamespace.run(sqlsanitize(tenant).toLowerCase(), f);
-};
-
-module.exports = (connObj) => ({
-  getTenantSchema() {
-    const storeVal = tenantNamespace.getStore();
-    return storeVal || connObj.default_schema;
-  },
-  enable_multi_tenant,
-  runWithTenant,
-  is_it_multi_tenant,
-});

package/db/pg.js

@@ -1,374 +0,0 @@
-/**
- * PostgreSQL data access layer
- */
-// TODO move postgresql specific to this module
-const { Pool } = require("pg");
-const copyStreams = require("pg-copy-streams");
-const { promisify } = require("util");
-const { pipeline } = require("stream");
-const { sqlsanitize, mkWhere, mkSelectOptions } = require("./internal");
-const { getConnectObject } = require("./connect");
-const { getTenantSchema } = require("./tenants");
-
-var connectObj = getConnectObject();
-
-var pool;
-if (connectObj) pool = new Pool(connectObj);
-
-var log_sql_enabled = false;
-
-/**
- * Control Logging sql statements to console
- * @param val - if true then log sql statements to console
- */
-function set_sql_logging(val = true) {
-  log_sql_enabled = val;
-}
-
-/**
- * Get sql logging state
- * @returns {boolean} if true then sql logging eabled
- */
-function get_sql_logging() {
-  return log_sql_enabled;
-}
-
-/**
- * Log SQL statement to console
- * @param sql - SQL statement
- * @param vs - any additional parameter
- */
-function sql_log(sql, vs) {
-  if (log_sql_enabled)
-    if (typeof vs === "undefined") console.log(sql);
-    else console.log(sql, vs);
-}
-
-/**
- * Close database connection
- * @returns {Promise<void>}
- */
-const close = async () => {
-  if (pool) await pool.end();
-};
-
-/**
- * Change connection (close connection and open new connection from connObj)
- * @param connObj - connection object
- * @returns {Promise<void>}
- */
-const changeConnection = async (connObj = {}) => {
-  await close();
-  pool = new Pool(getConnectObject(connObj));
-};
-
-/**
- * Execute Select statement
- * @param tbl - table name
- * @param whereObj - where object
- * @param selectopts - select options
- * @returns {Promise<*>} return rows
- */
-const select = async (tbl, whereObj, selectopts = {}) => {
-  const { where, values } = mkWhere(whereObj);
-  const sql = `SELECT * FROM "${getTenantSchema()}"."${sqlsanitize(
-    tbl
-  )}" ${where} ${mkSelectOptions(selectopts)}`;
-  sql_log(sql, values);
-  const tq = await pool.query(sql, values);
-
-  return tq.rows;
-};
-
-/**
- * Reset DB Schema using drop schema and recreate it
- * Atterntion! You will lost data after call this function!
- * @param schema - db schema name
- * @returns {Promise<void>} no result
- */
-const drop_reset_schema = async (schema) => {
-  const sql = `DROP SCHEMA IF EXISTS "${schema}" CASCADE;
-  CREATE SCHEMA "${schema}";
-  GRANT ALL ON SCHEMA "${schema}" TO postgres;
-  GRANT ALL ON SCHEMA "${schema}" TO "public" ;
-  COMMENT ON SCHEMA "${schema}" IS 'standard public schema';`;
-  sql_log(sql);
-
-  await pool.query(sql);
-};
-
-/**
- * Get count of rows in table
- * @param tbl - table name
- * @param whereObj - where object
- * @returns {Promise<number>} count of tables
- */
-const count = async (tbl, whereObj) => {
-  const { where, values } = mkWhere(whereObj);
-  const sql = `SELECT COUNT(*) FROM "${getTenantSchema()}"."${sqlsanitize(
-    tbl
-  )}" ${where}`;
-  sql_log(sql, values);
-  const tq = await pool.query(sql, values);
-
-  return parseInt(tq.rows[0].count);
-};
-
-/**
- * Get version of PostgreSQL
- * @param short - if true return short version info else full version info
- * @returns {Promise<*>} returns version
- */
-const getVersion = async (short) => {
-  const sql = `SELECT version();`;
-  sql_log(sql);
-  const tq = await pool.query(sql);
-  const v = tq.rows[0].version;
-  if (short) {
-    const ws = v.split(" ");
-    return ws[1];
-  }
-  return v;
-};
-
-/**
- * Delete rows in table
- * @param tbl - table name
- * @param whereObj - where object
- * @returns {Promise<*>} result of delete execution
- */
-const deleteWhere = async (tbl, whereObj, opts = {}) => {
-  const { where, values } = mkWhere(whereObj);
-  const sql = `delete FROM "${getTenantSchema()}"."${sqlsanitize(
-    tbl
-  )}" ${where}`;
-  sql_log(sql, values);
-
-  const tq = await (opts.client || pool).query(sql, values);
-
-  return tq.rows;
-};
-
-/**
- * Insert rows into table
- * @param tbl - table name
- * @param obj - columns names and data
- * @param opts - columns attributes
- * @returns {Promise<*>} returns primary key column or Id column value. If primary key column is not defined then return value of Id column.
- */
-const insert = async (tbl, obj, opts = {}) => {
-  const kvs = Object.entries(obj);
-  const fnameList = kvs.map(([k, v]) => `"${sqlsanitize(k)}"`).join();
-  var valPosList = [];
-  var valList = [];
-  const schema = getTenantSchema();
-  kvs.forEach(([k, v]) => {
-    if (v && v.next_version_by_id) {
-      valPosList.push(
-        `coalesce((select max(_version) from "${schema}"."${sqlsanitize(
-          tbl
-        )}" where id=${+v.next_version_by_id}), 0)+1`
-      );
-    } else {
-      valList.push(v);
-      valPosList.push(`$${valList.length}`);
-    }
-  });
-  const sql =
-    valPosList.length > 0
-      ? `insert into "${schema}"."${sqlsanitize(
-          tbl
-        )}"(${fnameList}) values(${valPosList.join()}) returning ${
-          opts.noid ? "*" : opts.pk_name || "id"
-        }`
-      : `insert into "${schema}"."${sqlsanitize(
-          tbl
-        )}" DEFAULT VALUES returning ${opts.noid ? "*" : opts.pk_name || "id"}`;
-  sql_log(sql, valList);
-  const { rows } = await (opts.client || pool).query(sql, valList);
-  if (opts.noid) return;
-  else return rows[0][opts.pk_name || "id"];
-};
-
-/**
- * Update table records
- * @param tbl - table name
- * @param obj - columns names and data
- * @param id - id of record (primary key column value)
- * @param opts - columns attributes
- * @returns {Promise<void>} no result
- */
-const update = async (tbl, obj, id, opts = {}) => {
-  const kvs = Object.entries(obj);
-  const assigns = kvs
-    .map(([k, v], ix) => `"${sqlsanitize(k)}"=$${ix + 1}`)
-    .join();
-  var 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(
-    tbl
-  )}" set ${assigns} where ${opts.pk_name || "id"}=$${kvs.length + 1}`;
-  sql_log(q, valList);
-  await pool.query(q, valList);
-};
-
-/**
- * Select one record
- * @param tbl - table name
- * @param where - where object
- * @returns {Promise<*>} return first record from sql result
- */
-const selectOne = async (tbl, where) => {
-  const rows = await select(tbl, where);
-  if (rows.length === 0) {
-    const w = mkWhere(where);
-    throw new Error(`no ${tbl} ${w.where} are ${w.values}`);
-  } else return rows[0];
-};
-
-/**
- * Select one record or null if no records
- * @param tbl - table name
- * @param where - where object
- * @returns {Promise<null|*>} - null if no record or first record data
- */
-const selectMaybeOne = async (tbl, where) => {
-  const rows = await select(tbl, where);
-  if (rows.length === 0) return null;
-  else return rows[0];
-};
-
-/**
- * Open db connection
- * Only for PG.
- * @returns {Promise<*>} db connection object
- */
-// TBD Currently this function supported only for PG
-const getClient = async () => await pool.connect();
-
-/**
- * Reset sequence
- * Only for PG
- * @param tblname - table name
- * @returns {Promise<void>} no result
- */
-const reset_sequence = async (tblname) => {
-  const sql = `SELECT setval(pg_get_serial_sequence('"${getTenantSchema()}"."${sqlsanitize(
-    tblname
-  )}"', 'id'), coalesce(max(id),0) + 1, false) FROM "${getTenantSchema()}"."${sqlsanitize(
-    tblname
-  )}";`;
-  await pool.query(sql);
-};
-
-/**
- * Add unique constraint
- * @param table_name - table name
- * @param field_names - list of columns (members of constraint)
- * @returns {Promise<void>} no result
- */
-const add_unique_constraint = async (table_name, field_names) => {
-  // TBD check that there are no problems with lenght of constraint name
-  const sql = `alter table "${getTenantSchema()}"."${sqlsanitize(
-    table_name
-  )}" add CONSTRAINT "${sqlsanitize(table_name)}_${field_names
-    .map((f) => sqlsanitize(f))
-    .join("_")}_unique" UNIQUE (${field_names
-    .map((f) => `"${sqlsanitize(f)}"`)
-    .join(",")});`;
-  sql_log(sql);
-  await pool.query(sql);
-};
-
-/**
- * Drop unique constraint
- * @param table_name - table name
- * @param field_names - list of columns (members of constraint)
- * @returns {Promise<void>} no results
- */
-const drop_unique_constraint = async (table_name, field_names) => {
-  // TBD check that there are no problems with lenght of constraint name
-  const sql = `alter table "${getTenantSchema()}"."${sqlsanitize(
-    table_name
-  )}" drop CONSTRAINT "${sqlsanitize(table_name)}_${field_names
-    .map((f) => sqlsanitize(f))
-    .join("_")}_unique";`;
-  sql_log(sql);
-  await pool.query(sql);
-};
-/**
- * Copy data from CSV to table?
- * Only for PG
- * @param fileStream - file stream
- * @param tableName - table name
- * @param fieldNames - list of columns
- * @param client - db connection
- * @returns {Promise<unknown>} new Promise
- */
-const copyFrom1 = (fileStream, tableName, fieldNames, client) => {
-  // TBD describe difference between CopyFrom and CopyFrom1
-  const quote = (s) => `"${s}"`;
-  const sql = `COPY "${sqlsanitize(tableName)}" (${fieldNames
-    .map(quote)
-    .join(",")}) FROM STDIN CSV HEADER`;
-  sql_log(sql);
-
-  var stream = client.query(copyStreams.from(sql));
-
-  return new Promise((resolve, reject) => {
-    fileStream.on("error", reject);
-    stream.on("error", reject);
-    stream.on("finish", resolve);
-    fileStream.pipe(stream).on("error", reject);
-  });
-};
-/**
- * Copy data from CSV to table?
- * Only for PG
- * @param fileStream - file stream
- * @param tableName - table name
- * @param fieldNames - list of columns
- * @param client - db connection
- * @returns {Promise<void>} no results
- */
-const copyFrom = async (fileStream, tableName, fieldNames, client) => {
-  // TBD describe difference between CopyFrom and CopyFrom1
-  const quote = (s) => `"${s}"`;
-  const sql = `COPY "${sqlsanitize(tableName)}" (${fieldNames
-    .map(quote)
-    .join(",")}) FROM STDIN CSV HEADER`;
-  sql_log(sql);
-
-  const stream = client.query(copyStreams.from(sql));
-  return await promisify(pipeline)(fileStream, stream);
-};
-
-module.exports = {
-  pool,
-  query: (text, params) => {
-    sql_log(text, params);
-    return pool.query(text, params);
-  },
-  select,
-  selectOne,
-  selectMaybeOne,
-  count,
-  insert,
-  update,
-  deleteWhere,
-  close,
-  sql_log,
-  changeConnection,
-  set_sql_logging,
-  get_sql_logging,
-  getClient,
-  mkWhere,
-  drop_reset_schema,
-  add_unique_constraint,
-  drop_unique_constraint,
-  reset_sequence,
-  getVersion,
-  copyFrom,
-};