@saltcorn/postgres 1.0.0-beta.0 → 1.0.0-beta.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saltcorn/postgres",
-  "version": "1.0.0-beta.0",
+  "version": "1.0.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.0.0-beta.0",
+    "@saltcorn/db-common": "1.0.0-beta.10",
     "pg": "^8.2.1",
     "pg-copy-streams": "^5.1.1"
   },

package/postgres.js

@@ -7,7 +7,9 @@
 const { Pool } = require("pg");
 const copyStreams = require("pg-copy-streams");
 const { promisify } = require("util");
-const { pipeline } = require("stream");
+const { pipeline } = require("stream/promises");
+const { Transform } = require("stream");
+
 const {
   sqlsanitize,
   mkWhere,
@@ -390,36 +392,6 @@ const drop_index = async (table_name, field_name) => {
   await pool.query(sql);
 };
 
-/**
- * Copy data from CSV to table?
- * Only for PG
- * @param {object} fileStream - file stream
- * @param {string} tableName - table name
- * @param {string[]} fieldNames - list of columns
- * @param {object} client - db connection
- * @returns {Promise<function>} new Promise
- */
-const copyFrom1 = (fileStream, tableName, fieldNames, client) => {
-  // TBD describe difference between CopyFrom and CopyFrom1
-  //  1. No tenant support
-  //  2. Manual promisification.
-  //  3. ???
-  //  4. Not exported nor used anywhere
-  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
@@ -430,7 +402,6 @@ const copyFrom1 = (fileStream, tableName, fieldNames, client) => {
  * @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 "${getTenantSchema()}"."${sqlsanitize(
     tableName
@@ -438,7 +409,16 @@ const copyFrom = async (fileStream, tableName, fieldNames, client) => {
   sql_log(sql);
 
   const stream = client.query(copyStreams.from(sql));
-  return await promisify(pipeline)(fileStream, stream);
+  return await pipeline(fileStream, stream);
+};
+
+const copyToJson = async (fileStream, tableName, client) => {
+  const sql = `COPY (SELECT (row_to_json("${sqlsanitize(tableName)}".*) || ',')
+  FROM "${getTenantSchema()}"."${sqlsanitize(tableName)}") TO STDOUT`;
+  sql_log(sql);
+  const stream = (client || pool).query(copyStreams.to(sql));
+
+  return await pipeline(stream, fileStream);
 };
 
 const slugify = (s) =>
@@ -529,6 +509,7 @@ const postgresExports = {
   reset_sequence,
   getVersion,
   copyFrom,
+  copyToJson,
   slugify,
   time,
   listTables,