@budibase/server 0.9.140-alpha.4 → 0.9.140-alpha.5

package/dist/automations/steps/updateRow.js

@@ -10,6 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 const rowController = require("../../api/controllers/row");
 const automationUtils = require("../automationUtils");
+const { buildCtx } = require("./utils");
 exports.definition = {
     name: "Update Row",
     tagline: "Update a {{inputs.enriched.table.name}} row",
@@ -79,16 +80,12 @@ exports.run = function ({ inputs, appId, emitter }) {
             }
         }
         // have to clean up the row, remove the table from it
-        const ctx = {
+        const ctx = buildCtx(appId, emitter, {
+            body: Object.assign(Object.assign({}, inputs.row), { _id: inputs.rowId }),
             params: {
                 rowId: inputs.rowId,
             },
-            request: {
-                body: Object.assign(Object.assign({}, inputs.row), { _id: inputs.rowId }),
-            },
-            appId,
-            eventEmitter: emitter,
-        };
+        });
         try {
             inputs.row = yield automationUtils.cleanUpRowById(appId, inputs.rowId, inputs.row);
             yield rowController.patch(ctx);

package/dist/db/inMemoryView.js

@@ -0,0 +1,51 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+const PouchDB = require("pouchdb");
+const memory = require("pouchdb-adapter-memory");
+const newid = require("./newid");
+PouchDB.plugin(memory);
+const Pouch = PouchDB.defaults({
+    prefix: undefined,
+    adapter: "memory",
+});
+exports.runView = (view, calculation, group, data) => __awaiter(void 0, void 0, void 0, function* () {
+    // use a different ID each time for the DB, make sure they
+    // are always unique for each query, don't want overlap
+    // which could cause 409s
+    const db = new Pouch(newid());
+    // write all the docs to the in memory Pouch (remove revs)
+    yield db.bulkDocs(data.map(row => (Object.assign(Object.assign({}, row), { _rev: undefined }))));
+    let fn = (doc, emit) => emit(doc._id);
+    eval("fn = " + view.map.replace("function (doc)", "function (doc, emit)"));
+    const queryFns = {
+        meta: view.meta,
+        map: fn,
+    };
+    if (view.reduce) {
+        queryFns.reduce = view.reduce;
+    }
+    const response = yield db.query(queryFns, {
+        include_docs: !calculation,
+        group: !!group,
+    });
+    // need to fix the revs to be totally accurate
+    for (let row of response.rows) {
+        if (!row._rev || !row._id) {
+            continue;
+        }
+        const found = data.find(possible => possible._id === row._id);
+        if (found) {
+            row._rev = found._rev;
+        }
+    }
+    yield db.destroy();
+    return response;
+});

package/dist/db/linkedRows/index.js

@@ -66,7 +66,10 @@ function getFullLinkedDocs(ctx, appId, links) {
         // create DBs
         const db = new CouchDB(appId);
         const linkedRowIds = links.map(link => link.id);
-        let linked = (yield db.allDocs(getMultiIDParams(linkedRowIds))).rows.map(row => row.doc);
+        const uniqueRowIds = [...new Set(linkedRowIds)];
+        let dbRows = (yield db.allDocs(getMultiIDParams(uniqueRowIds))).rows.map(row => row.doc);
+        // convert the unique db rows back to a full list of linked rows
+        const linked = linkedRowIds.map(id => dbRows.find(row => row._id === id));
         // need to handle users as specific cases
         let [users, other] = partition(linked, linkRow => linkRow._id.startsWith(USER_METDATA_PREFIX));
         users = yield getGlobalUsersFromMetadata(appId, users);
@@ -98,7 +101,7 @@ exports.updateLinks = function (args) {
         }
         let linkController = new LinkController(args);
         try {
-            if (!(yield linkController.doesTableHaveLinkedFields()) &&
+            if (!(yield linkController.doesTableHaveLinkedFields(table)) &&
                 (oldTable == null ||
                     !(yield linkController.doesTableHaveLinkedFields(oldTable)))) {
                 return baseReturnObj;

package/dist/db/utils.js

@@ -27,6 +27,7 @@ const DocumentTypes = {
     QUERY: "query",
     DEPLOYMENTS: "deployments",
     METADATA: "metadata",
+    MEM_VIEW: "view",
 };
 const ViewNames = {
     LINK: "by_link",
@@ -279,6 +280,12 @@ exports.getMetadataParams = (type, entityId = null, otherProps = {}) => {
     }
     return getDocParams(DocumentTypes.METADATA, docId, otherProps);
 };
+exports.generateMemoryViewID = viewName => {
+    return `${DocumentTypes.MEM_VIEW}${SEPARATOR}${viewName}`;
+};
+exports.getMemoryViewParams = (otherProps = {}) => {
+    return getDocParams(DocumentTypes.MEM_VIEW, null, otherProps);
+};
 /**
  * This can be used with the db.allDocs to get a list of IDs
  */

package/dist/environment.js

@@ -20,7 +20,7 @@ module.exports = {
     COUCH_DB_URL: process.env.COUCH_DB_URL,
     MINIO_URL: process.env.MINIO_URL,
     WORKER_URL: process.env.WORKER_URL,
-    SELF_HOSTED: !!parseInt(process.env.SELF_HOSTED),
+    SELF_HOSTED: process.env.SELF_HOSTED,
     AWS_REGION: process.env.AWS_REGION,
     ENABLE_ANALYTICS: process.env.ENABLE_ANALYTICS,
     MINIO_ACCESS_KEY: process.env.MINIO_ACCESS_KEY,
@@ -60,3 +60,9 @@ module.exports = {
         return !isDev();
     },
 };
+// convert any strings to numbers if required, like "0" would be true otherwise
+for (let [key, value] of Object.entries(module.exports)) {
+    if (typeof value === "string" && !isNaN(parseInt(value))) {
+        module.exports[key] = parseInt(value);
+    }
+}

package/dist/integrations/mysql.js

@@ -15,7 +15,7 @@ var MySQLModule;
 (function (MySQLModule) {
     const mysql = require("mysql");
     const Sql = require("./base/sql");
-    const { buildExternalTableId, convertType } = require("./utils");
+    const { buildExternalTableId, convertType, copyExistingPropsOver } = require("./utils");
     const { FieldTypes } = require("../constants");
     const TYPE_MAP = {
         text: FieldTypes.LONGFORM,
@@ -160,18 +160,7 @@ var MySQLModule;
                             schema,
                         };
                     }
-                    // add the existing relationships from the entities if they exist, to prevent them from being overridden
-                    if (entities && entities[tableName]) {
-                        const existingTableSchema = entities[tableName].schema;
-                        for (let key in existingTableSchema) {
-                            if (!existingTableSchema.hasOwnProperty(key)) {
-                                continue;
-                            }
-                            if (existingTableSchema[key].type === "link") {
-                                tables[tableName].schema[key] = existingTableSchema[key];
-                            }
-                        }
-                    }
+                    copyExistingPropsOver(tableName, tables, entities);
                 }
                 this.client.end();
                 this.tables = tables;

package/dist/integrations/postgres.js

@@ -16,7 +16,7 @@ var PostgresModule;
     const { Pool } = require("pg");
     const Sql = require("./base/sql");
     const { FieldTypes } = require("../constants");
-    const { buildExternalTableId, convertType } = require("./utils");
+    const { buildExternalTableId, convertType, copyExistingPropsOver } = require("./utils");
     const SCHEMA = {
         docs: "https://node-postgres.com",
         plus: true,
@@ -150,28 +150,22 @@ var PostgresModule;
                             name: tableName,
                             schema: {},
                         };
-                        // add the existing relationships from the entities if they exist, to prevent them from being overridden
-                        if (entities && entities[tableName]) {
-                            const existingTableSchema = entities[tableName].schema;
-                            for (let key in existingTableSchema) {
-                                if (!existingTableSchema.hasOwnProperty(key)) {
-                                    continue;
-                                }
-                                if (existingTableSchema[key].type === "link") {
-                                    tables[tableName].schema[key] = existingTableSchema[key];
-                                }
-                            }
-                        }
                     }
                     const type = convertType(column.data_type, TYPE_MAP);
-                    const isAuto = typeof column.column_default === "string" &&
+                    const identity = !!(column.identity_generation || column.identity_start || column.identity_increment);
+                    const hasDefault = typeof column.column_default === "string" &&
                         column.column_default.startsWith("nextval");
+                    const isGenerated = column.is_generated && column.is_generated !== "NEVER";
+                    const isAuto = hasDefault || identity || isGenerated;
                     tables[tableName].schema[columnName] = {
                         autocolumn: isAuto,
                         name: columnName,
                         type,
                     };
                 }
+                for (let tableName of Object.keys(tables)) {
+                    copyExistingPropsOver(tableName, tables, entities);
+                }
                 this.tables = tables;
             });
         }

package/dist/integrations/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isIsoDateString = exports.isSQL = exports.getSqlQuery = exports.convertType = exports.breakRowIdField = exports.generateRowIdField = exports.breakExternalTableId = exports.buildExternalTableId = exports.isExternalTable = void 0;
+exports.copyExistingPropsOver = exports.isIsoDateString = exports.isSQL = exports.getSqlQuery = exports.convertType = exports.breakRowIdField = exports.generateRowIdField = exports.breakExternalTableId = exports.buildExternalTableId = exports.isExternalTable = void 0;
 const datasource_1 = require("../definitions/datasource");
 const { DocumentTypes, SEPARATOR } = require("../db/utils");
 const { FieldTypes } = require("../constants");
@@ -84,3 +84,21 @@ function isIsoDateString(str) {
     return d.toISOString() === str;
 }
 exports.isIsoDateString = isIsoDateString;
+// add the existing relationships from the entities if they exist, to prevent them from being overridden
+function copyExistingPropsOver(tableName, tables, entities) {
+    if (entities && entities[tableName]) {
+        if (entities[tableName].primaryDisplay) {
+            tables[tableName].primaryDisplay = entities[tableName].primaryDisplay;
+        }
+        const existingTableSchema = entities[tableName].schema;
+        for (let key in existingTableSchema) {
+            if (!existingTableSchema.hasOwnProperty(key)) {
+                continue;
+            }
+            if (existingTableSchema[key].type === "link") {
+                tables[tableName].schema[key] = existingTableSchema[key];
+            }
+        }
+    }
+}
+exports.copyExistingPropsOver = copyExistingPropsOver;

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "0.9.140-alpha.3",
+    "version": "0.9.140-alpha.4",
     "description": "Budibase Web Server",
     "main": "src/index.js",
     "repository": {
@@ -62,9 +62,9 @@
     "author": "Budibase",
     "license": "AGPL-3.0-or-later",
     "dependencies": {
-        "@budibase/auth": "^0.9.140-alpha.3",
-        "@budibase/client": "^0.9.140-alpha.3",
-        "@budibase/string-templates": "^0.9.140-alpha.3",
+        "@budibase/auth": "^0.9.140-alpha.4",
+        "@budibase/client": "^0.9.140-alpha.4",
+        "@budibase/string-templates": "^0.9.140-alpha.4",
         "@elastic/elasticsearch": "7.10.0",
         "@koa/router": "8.0.0",
         "@sendgrid/mail": "7.1.1",
@@ -105,6 +105,7 @@
         "pouchdb-all-dbs": "1.0.2",
         "pouchdb-find": "^7.2.2",
         "pouchdb-replication-stream": "1.2.9",
+        "pouchdb-adapter-memory": "^7.2.1",
         "server-destroy": "1.0.1",
         "svelte": "^3.38.2",
         "to-json-schema": "0.2.5",
@@ -131,7 +132,6 @@
         "express": "^4.17.1",
         "jest": "^27.0.5",
         "nodemon": "^2.0.4",
-        "pouchdb-adapter-memory": "^7.2.1",
         "prettier": "^2.3.1",
         "rimraf": "^3.0.2",
         "supertest": "^4.0.2",