@saltcorn/postgres 1.0.0-beta.9 → 1.0.0-rc.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saltcorn/postgres",
-  "version": "1.0.0-beta.9",
+  "version": "1.0.0-rc.2",
   "description": "Postgres structures for Saltcorn, open-source no-code platform",
   "homepage": "https://saltcorn.com",
   "scripts": {
@@ -12,9 +12,10 @@
   "license": "MIT",
   "main": "index.js",
   "dependencies": {
-    "@saltcorn/db-common": "1.0.0-beta.9",
+    "@saltcorn/db-common": "1.0.0-rc.2",
     "pg": "^8.2.1",
-    "pg-copy-streams": "^5.1.1"
+    "pg-copy-streams": "^5.1.1",
+    "replacestream": "4.0.3"
   },
   "repository": "github:saltcorn/saltcorn",
   "publishConfig": {

package/postgres.js

@@ -9,7 +9,7 @@ const copyStreams = require("pg-copy-streams");
 const { promisify } = require("util");
 const { pipeline } = require("stream/promises");
 const { Transform } = require("stream");
-
+const replace = require("replacestream");
 const {
   sqlsanitize,
   mkWhere,
@@ -64,7 +64,7 @@ const close = async () => {
  * @param {object} [connObj = {}] - connection object
  * @returns {Promise<void>}
  */
-const changeConnection = async (connObj = {}) => {
+const changeConnection = async (connObj = Object.create(null)) => {
   await close();
   pool = new Pool(getConnectObject(connObj));
 };
@@ -93,7 +93,7 @@ const rollback = async () => {
  * @param {object} [selectopts = {}] - select options
  * @returns {Promise<*>} return rows
  */
-const select = async (tbl, whereObj, selectopts = {}) => {
+const select = async (tbl, whereObj, selectopts = Object.create(null)) => {
   const { where, values } = mkWhere(whereObj);
   const schema = selectopts.schema || getTenantSchema();
   const sql = `SELECT ${
@@ -134,6 +134,28 @@ const drop_reset_schema = async (schema) => {
  */
 const count = async (tbl, whereObj) => {
   const { where, values } = mkWhere(whereObj);
+  if (!where) {
+    try {
+      // fast count for large table but may be stale
+      // https://stackoverflow.com/questions/7943233/fast-way-to-discover-the-row-count-of-a-table-in-postgresql
+      //https://www.citusdata.com/blog/2016/10/12/count-performance/
+      const sql = `SELECT (CASE WHEN c.reltuples < 0 THEN NULL
+             WHEN c.relpages = 0 THEN float8 '0'  -- empty table
+             ELSE c.reltuples / c.relpages END
+     * (pg_catalog.pg_relation_size(c.oid)
+      / pg_catalog.current_setting('block_size')::int)
+       )::bigint
+FROM   pg_catalog.pg_class c
+WHERE  c.oid = '"${getTenantSchema()}"."${sqlsanitize(tbl)}"'::regclass`;
+      sql_log(sql);
+      const tq = await (client || pool).query(sql, []);
+      const n = +tq.rows[0].int8;
+      if (n && n > 10000) return n;
+    } catch {
+      //skip fast estimate
+    }
+  }
+
   const sql = `SELECT COUNT(*) FROM "${getTenantSchema()}"."${sqlsanitize(
     tbl
   )}" ${where}`;
@@ -167,7 +189,7 @@ const getVersion = async (short) => {
  * @param {object} [opts = {}]
  * @returns {Promise<object[]>} result of delete execution
  */
-const deleteWhere = async (tbl, whereObj, opts = {}) => {
+const deleteWhere = async (tbl, whereObj, opts = Object.create(null)) => {
   const { where, values } = mkWhere(whereObj);
   const sql = `delete FROM "${getTenantSchema()}"."${sqlsanitize(
     tbl
@@ -186,7 +208,7 @@ const deleteWhere = async (tbl, whereObj, opts = {}) => {
  * @param {object} [opts = {}] - columns attributes
  * @returns {Promise<string>} 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 insert = async (tbl, obj, opts = Object.create(null)) => {
   const kvs = Object.entries(obj);
   const fnameList = kvs.map(([k, v]) => `"${sqlsanitize(k)}"`).join();
   var valPosList = [];
@@ -231,7 +253,7 @@ const insert = async (tbl, obj, opts = {}) => {
  * @param {object} [opts = {}] - columns attributes
  * @returns {Promise<void>} no result
  */
-const update = async (tbl, obj, id, opts = {}) => {
+const update = async (tbl, obj, id, opts = Object.create(null)) => {
   const kvs = Object.entries(obj);
   if (kvs.length === 0) return;
   const assigns = kvs
@@ -256,7 +278,7 @@ const update = async (tbl, obj, id, opts = {}) => {
  * @param {object} opts - can contain a db client for transactions
  * @returns {Promise<void>} no result
  */
-const updateWhere = async (tbl, obj, whereObj, opts = {}) => {
+const updateWhere = async (tbl, obj, whereObj, opts = Object.create(null)) => {
   const kvs = Object.entries(obj);
   if (kvs.length === 0) return;
   const { where, values } = mkWhere(whereObj, false, kvs.length);
@@ -280,7 +302,7 @@ const updateWhere = async (tbl, obj, whereObj, opts = {}) => {
  * @returns {Promise<object>} return first record from sql result
  * @throws {Error}
  */
-const selectOne = async (tbl, where, selectopts = {}) => {
+const selectOne = async (tbl, where, selectopts = Object.create(null)) => {
   const rows = await select(tbl, where, { ...selectopts, limit: 1 });
   if (rows.length === 0) {
     const w = mkWhere(where);
@@ -295,7 +317,7 @@ const selectOne = async (tbl, where, selectopts = {}) => {
  * @param {object} [selectopts = {}] - select options
  * @returns {Promise<null|object>} - null if no record or first record data
  */
-const selectMaybeOne = async (tbl, where, selectopts = {}) => {
+const selectMaybeOne = async (tbl, where, selectopts = Object.create(null)) => {
   const rows = await select(tbl, where, { ...selectopts, limit: 1 });
   if (rows.length === 0) return null;
   else return rows[0];
@@ -418,7 +440,7 @@ const copyToJson = async (fileStream, tableName, client) => {
   sql_log(sql);
   const stream = (client || pool).query(copyStreams.to(sql));
 
-  return await pipeline(stream, fileStream);
+  return await pipeline(stream, replace("\\\\", "\\"), fileStream);
 };
 
 const slugify = (s) =>