@budibase/server 1.0.49-alpha.7 → 1.0.50-alpha.0

package/dist/api/controllers/row/ExternalRequest.js

@@ -155,7 +155,7 @@ var External;
         thisRow._id = generateIdForRow(row, table);
         thisRow.tableId = table._id;
         thisRow._rev = "rev";
-        return thisRow;
+        return utils_4.processFormulas(table, thisRow);
     }
     function fixArrayTypes(row, table) {
         for (let [fieldName, schema] of Object.entries(table.schema)) {
@@ -278,14 +278,24 @@ var External;
          * This iterates through the returned rows and works out what elements of the rows
          * actually match up to another row (based on primary keys) - this is pretty specific
          * to SQL and the way that SQL relationships are returned based on joins.
+         * This is complicated, but the idea is that when a SQL query returns all the relations
+         * will be separate rows, with all of the data in each row. We have to decipher what comes
+         * from where (which tables) and how to convert that into budibase columns.
          */
-        updateRelationshipColumns(row, rows, relationships) {
+        updateRelationshipColumns(table, row, rows, relationships) {
             const columns = {};
             for (let relationship of relationships) {
                 const linkedTable = this.tables[relationship.tableName];
                 if (!linkedTable) {
                     continue;
                 }
+                const fromColumn = `${table.name}.${relationship.from}`;
+                const toColumn = `${linkedTable.name}.${relationship.to}`;
+                // this is important when working with multiple relationships
+                // between the same tables, don't want to overlap/multiply the relations
+                if (!relationship.through && row[fromColumn] !== row[toColumn]) {
+                    continue;
+                }
                 let linked = basicProcessing(row, linkedTable);
                 if (!linked._id) {
                     continue;
@@ -323,7 +333,7 @@ var External;
                 row._id = rowId;
                 // this is a relationship of some sort
                 if (finalRows[rowId]) {
-                    finalRows = this.updateRelationshipColumns(row, finalRows, relationships);
+                    finalRows = this.updateRelationshipColumns(table, row, finalRows, relationships);
                     continue;
                 }
                 const thisRow = fixArrayTypes(basicProcessing(row, table), table);
@@ -332,7 +342,7 @@ var External;
                 }
                 finalRows[thisRow._id] = thisRow;
                 // do this at end once its been added to the final rows
-                finalRows = this.updateRelationshipColumns(row, finalRows, relationships);
+                finalRows = this.updateRelationshipColumns(table, row, finalRows, relationships);
             }
             return utils_4.processFormulas(table, Object.values(finalRows));
         }

package/dist/api/controllers/row/external.js

@@ -43,22 +43,20 @@ function handleRequest(operation, tableId, opts = {}) {
 }
 exports.handleRequest = handleRequest;
 exports.patch = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const appId = ctx.appId;
     const inputs = ctx.request.body;
     const tableId = ctx.params.tableId;
     const id = breakRowIdField(inputs._id);
     // don't save the ID to db
     delete inputs._id;
-    return handleRequest(appId, DataSourceOperation.UPDATE, tableId, {
+    return handleRequest(DataSourceOperation.UPDATE, tableId, {
         id,
         row: inputs,
     });
 });
 exports.save = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const appId = ctx.appId;
     const inputs = ctx.request.body;
     const tableId = ctx.params.tableId;
-    return handleRequest(appId, DataSourceOperation.CREATE, tableId, {
+    return handleRequest(DataSourceOperation.CREATE, tableId, {
         row: inputs,
     });
 });
@@ -70,35 +68,31 @@ exports.fetchView = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     return exports.fetch(ctx);
 });
 exports.fetch = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const appId = ctx.appId;
     const tableId = ctx.params.tableId;
-    return handleRequest(appId, DataSourceOperation.READ, tableId);
+    return handleRequest(DataSourceOperation.READ, tableId);
 });
 exports.find = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const appId = ctx.appId;
     const id = ctx.params.rowId;
     const tableId = ctx.params.tableId;
-    const response = yield handleRequest(appId, DataSourceOperation.READ, tableId, {
+    const response = yield handleRequest(DataSourceOperation.READ, tableId, {
         id,
     });
     return response ? response[0] : response;
 });
 exports.destroy = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const appId = ctx.appId;
     const tableId = ctx.params.tableId;
     const id = ctx.request.body._id;
-    const { row } = yield handleRequest(appId, DataSourceOperation.DELETE, tableId, {
+    const { row } = yield handleRequest(DataSourceOperation.DELETE, tableId, {
         id,
     });
     return { response: { ok: true }, row };
 });
 exports.bulkDestroy = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const appId = ctx.appId;
     const { rows } = ctx.request.body;
     const tableId = ctx.params.tableId;
     let promises = [];
     for (let row of rows) {
-        promises.push(handleRequest(appId, DataSourceOperation.DELETE, tableId, {
+        promises.push(handleRequest(DataSourceOperation.DELETE, tableId, {
             id: breakRowIdField(row._id),
         }));
     }
@@ -106,7 +100,6 @@ exports.bulkDestroy = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     return { response: { ok: true }, rows: responses.map(resp => resp.row) };
 });
 exports.search = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const appId = ctx.appId;
     const tableId = ctx.params.tableId;
     const _a = ctx.request.body, { paginate, query } = _a, params = __rest(_a, ["paginate", "query"]);
     let { bookmark, limit } = params;
@@ -135,14 +128,14 @@ exports.search = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
             [params.sort]: direction,
         };
     }
-    const rows = yield handleRequest(appId, DataSourceOperation.READ, tableId, {
+    const rows = yield handleRequest(DataSourceOperation.READ, tableId, {
         filters: query,
         sort,
         paginate: paginateObj,
     });
     let hasNextPage = false;
     if (paginate && rows.length === limit) {
-        const nextRows = yield handleRequest(appId, DataSourceOperation.READ, tableId, {
+        const nextRows = yield handleRequest(DataSourceOperation.READ, tableId, {
             filters: query,
             sort,
             paginate: {
@@ -160,7 +153,6 @@ exports.validate = () => __awaiter(void 0, void 0, void 0, function* () {
     return { valid: true };
 });
 exports.fetchEnrichedRow = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const appId = ctx.appId;
     const id = ctx.params.rowId;
     const tableId = ctx.params.tableId;
     const { datasourceId, tableName } = breakExternalTableId(tableId);
@@ -170,7 +162,7 @@ exports.fetchEnrichedRow = (ctx) => __awaiter(void 0, void 0, void 0, function*
         ctx.throw(400, "Datasource has not been configured for plus API.");
     }
     const tables = datasource.entities;
-    const response = yield handleRequest(appId, DataSourceOperation.READ, tableId, {
+    const response = yield handleRequest(DataSourceOperation.READ, tableId, {
         id,
         datasource,
     });
@@ -189,7 +181,7 @@ exports.fetchEnrichedRow = (ctx) => __awaiter(void 0, void 0, void 0, function*
         const linkedTable = tables[breakExternalTableId(linkedTableId).tableName];
         // don't support composite keys right now
         const linkedIds = links.map(link => breakRowIdField(link._id)[0]);
-        row[fieldName] = yield handleRequest(appId, DataSourceOperation.READ, linkedTableId, {
+        row[fieldName] = yield handleRequest(DataSourceOperation.READ, linkedTableId, {
             tables,
             filters: {
                 oneOf: {

package/dist/api/controllers/static/index.js

@@ -21,7 +21,7 @@ const { clientLibraryPath } = require("../../../utilities");
 const { upload } = require("../../../utilities/fileSystem");
 const { attachmentsRelativeURL } = require("../../../utilities");
 const { DocumentTypes } = require("../../../db/utils");
-const { getAppDB } = require("@budibase/backend-core/context");
+const { getAppDB, updateAppId } = require("@budibase/backend-core/context");
 const AWS = require("aws-sdk");
 const AWS_REGION = env.AWS_REGION ? env.AWS_REGION : "eu-west-1";
 function prepareUpload({ s3Key, bucket, metadata, file }) {
@@ -50,12 +50,9 @@ function getAppIdFromUrl(ctx) {
         // search prod apps for a url that matches, exclude dev where id is always used
         const apps = yield getAllApps({ dev: false });
         const app = apps.filter(a => a.url && a.url.toLowerCase() === possibleAppUrl)[0];
-        if (app && app.appId) {
-            return app.appId;
-        }
-        else {
-            return ctx.params.appId;
-        }
+        const appId = app && app.appId ? app.appId : ctx.params.appId;
+        updateAppId(appId);
+        return appId;
     });
 }
 exports.serveBuilder = function (ctx) {

package/dist/api/controllers/user.js

@@ -16,7 +16,7 @@ const { isEqual } = require("lodash");
 const { BUILTIN_ROLE_IDS } = require("@budibase/backend-core/roles");
 const { getDevelopmentAppID, getProdAppIDs, dbExists, } = require("@budibase/backend-core/db");
 const { UserStatus } = require("@budibase/backend-core/constants");
-const { getAppDB } = require("@budibase/backend-core/context");
+const { getAppDB, doInAppContext } = require("@budibase/backend-core/context");
 function rawMetadata() {
     return __awaiter(this, void 0, void 0, function* () {
         const db = getAppDB();
@@ -97,31 +97,33 @@ exports.syncUser = function (ctx) {
                 if (!(yield dbExists(appId))) {
                     continue;
                 }
-                const db = getAppDB();
-                const metadataId = generateUserMetadataID(userId);
-                let metadata;
-                try {
-                    metadata = yield db.get(metadataId);
-                }
-                catch (err) {
-                    if (deleting) {
-                        continue;
+                yield doInAppContext(appId, () => __awaiter(this, void 0, void 0, function* () {
+                    const db = getAppDB();
+                    const metadataId = generateUserMetadataID(userId);
+                    let metadata;
+                    try {
+                        metadata = yield db.get(metadataId);
                     }
-                    metadata = {
-                        tableId: InternalTables.USER_METADATA,
-                    };
-                }
-                // assign the roleId for the metadata doc
-                if (roleId) {
-                    metadata.roleId = roleId;
-                }
-                let combined = !deleting
-                    ? combineMetadataAndUser(user, metadata)
-                    : Object.assign(Object.assign({}, metadata), { status: UserStatus.INACTIVE, metadata: BUILTIN_ROLE_IDS.PUBLIC });
-                // if its null then there was no updates required
-                if (combined) {
-                    yield db.put(combined);
-                }
+                    catch (err) {
+                        if (deleting) {
+                            return;
+                        }
+                        metadata = {
+                            tableId: InternalTables.USER_METADATA,
+                        };
+                    }
+                    // assign the roleId for the metadata doc
+                    if (roleId) {
+                        metadata.roleId = roleId;
+                    }
+                    let combined = !deleting
+                        ? combineMetadataAndUser(user, metadata)
+                        : Object.assign(Object.assign({}, metadata), { status: UserStatus.INACTIVE, metadata: BUILTIN_ROLE_IDS.PUBLIC });
+                    // if its null then there was no updates required
+                    if (combined) {
+                        yield db.put(combined);
+                    }
+                }));
             }
         }
         ctx.body = {

package/dist/integrations/base/sql.js

@@ -159,15 +159,14 @@ class InternalBuilder {
     addSorting(query, json) {
         var _a;
         let { sort, paginate } = json;
-        if (!sort) {
-            return query;
-        }
         const table = (_a = json.meta) === null || _a === void 0 ? void 0 : _a.table;
-        for (let [key, value] of Object.entries(sort)) {
-            const direction = value === datasource_1.SortDirection.ASCENDING ? "asc" : "desc";
-            query = query.orderBy(`${table === null || table === void 0 ? void 0 : table.name}.${key}`, direction);
+        if (sort) {
+            for (let [key, value] of Object.entries(sort)) {
+                const direction = value === datasource_1.SortDirection.ASCENDING ? "asc" : "desc";
+                query = query.orderBy(`${table === null || table === void 0 ? void 0 : table.name}.${key}`, direction);
+            }
         }
-        if (this.client === utils_1.SqlClients.MS_SQL && !sort && (paginate === null || paginate === void 0 ? void 0 : paginate.limit)) {
+        else if (this.client === utils_1.SqlClients.MS_SQL && (paginate === null || paginate === void 0 ? void 0 : paginate.limit)) {
             // @ts-ignore
             query = query.orderBy(`${table === null || table === void 0 ? void 0 : table.name}.${table === null || table === void 0 ? void 0 : table.primary[0]}`);
         }
@@ -177,20 +176,55 @@ class InternalBuilder {
         if (!relationships) {
             return query;
         }
+        const tableSets = {};
+        // aggregate into table sets (all the same to tables)
         for (let relationship of relationships) {
-            const from = relationship.from, to = relationship.to, toTable = relationship.tableName;
-            if (!relationship.through) {
+            const keyObj = {
+                toTable: relationship.tableName,
+                throughTable: undefined,
+            };
+            if (relationship.through) {
+                keyObj.throughTable = relationship.through;
+            }
+            const key = JSON.stringify(keyObj);
+            if (tableSets[key]) {
+                tableSets[key].push(relationship);
+            }
+            else {
+                tableSets[key] = [relationship];
+            }
+        }
+        for (let [key, relationships] of Object.entries(tableSets)) {
+            const { toTable, throughTable } = JSON.parse(key);
+            if (!throughTable) {
                 // @ts-ignore
-                query = query.leftJoin(toTable, `${fromTable}.${from}`, `${toTable}.${to}`);
+                query = query.join(toTable, function () {
+                    for (let relationship of relationships) {
+                        const from = relationship.from, to = relationship.to;
+                        // @ts-ignore
+                        this.orOn(`${fromTable}.${from}`, "=", `${toTable}.${to}`);
+                    }
+                }, "left");
             }
             else {
-                const throughTable = relationship.through;
-                const fromPrimary = relationship.fromPrimary;
-                const toPrimary = relationship.toPrimary;
                 query = query
                     // @ts-ignore
-                    .leftJoin(throughTable, `${fromTable}.${fromPrimary}`, `${throughTable}.${from}`)
-                    .leftJoin(toTable, `${toTable}.${toPrimary}`, `${throughTable}.${to}`);
+                    .join(throughTable, function () {
+                    for (let relationship of relationships) {
+                        const fromPrimary = relationship.fromPrimary;
+                        const from = relationship.from;
+                        // @ts-ignore
+                        this.orOn(`${fromTable}.${fromPrimary}`, "=", `${throughTable}.${from}`);
+                    }
+                }, "left")
+                    .join(toTable, function () {
+                    for (let relationship of relationships) {
+                        const toPrimary = relationship.toPrimary;
+                        const to = relationship.to;
+                        // @ts-ignore
+                        this.orOn(`${toTable}.${toPrimary}`, `${throughTable}.${to}`);
+                    }
+                }, "left");
             }
         }
         return query.limit(BASE_LIMIT);

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "1.0.49-alpha.6",
+    "version": "1.0.49",
     "description": "Budibase Web Server",
     "main": "src/index.ts",
     "repository": {
@@ -70,9 +70,9 @@
     "license": "GPL-3.0",
     "dependencies": {
         "@apidevtools/swagger-parser": "^10.0.3",
-        "@budibase/backend-core": "^1.0.49-alpha.6",
-        "@budibase/client": "^1.0.49-alpha.6",
-        "@budibase/string-templates": "^1.0.49-alpha.6",
+        "@budibase/backend-core": "^1.0.49",
+        "@budibase/client": "^1.0.49",
+        "@budibase/string-templates": "^1.0.49",
         "@bull-board/api": "^3.7.0",
         "@bull-board/koa": "^3.7.0",
         "@elastic/elasticsearch": "7.10.0",

package/dist/threads/query.js

@@ -14,8 +14,6 @@ const ScriptRunner = require("../utilities/scriptRunner");
 const { integrations } = require("../integrations");
 const { processStringSync } = require("@budibase/string-templates");
 const { doInAppContext, getAppDB } = require("@budibase/backend-core/context");
-const IS_TRIPLE_BRACE = new RegExp(/^{{3}.*}{3}$/);
-const IS_HANDLEBARS = new RegExp(/^{{2}.*}{2}$/);
 class QueryRunner {
     constructor(input, flags = { noRecursiveQuery: false }) {
         this.datasource = input.datasource;
@@ -180,12 +178,8 @@ class QueryRunner {
             }
             else if (typeof fields[key] === "string") {
                 // enrich string value as normal
-                let value = fields[key];
-                // add triple brace to avoid escaping e.g. '=' in cookie header
-                if (IS_HANDLEBARS.test(value) && !IS_TRIPLE_BRACE.test(value)) {
-                    value = `{${value}}`;
-                }
-                enrichedQuery[key] = processStringSync(value, parameters, {
+                enrichedQuery[key] = processStringSync(fields[key], parameters, {
+                    noEscaping: true,
                     noHelpers: true,
                 });
             }