@budibase/server 0.9.190-alpha.0 → 0.9.190-alpha.4

package/dist/api/controllers/application.js

@@ -13,10 +13,9 @@ const env = require("../../environment");
 const packageJson = require("../../../package.json");
 const { createLinkView, createRoutingView, createAllSearchIndex, } = require("../../db/views/staticViews");
 const { getTemplateStream, createApp, deleteApp, } = require("../../utilities/fileSystem");
-const { generateAppID, getLayoutParams, getScreenParams, generateScreenID, generateDevAppID, DocumentTypes, AppStatus, } = require("../../db/utils");
+const { generateAppID, getLayoutParams, getScreenParams, generateDevAppID, DocumentTypes, AppStatus, } = require("../../db/utils");
 const { BUILTIN_ROLE_IDS, AccessController } = require("@budibase/auth/roles");
 const { BASE_LAYOUTS } = require("../../constants/layouts");
-const { createHomeScreen } = require("../../constants/screens");
 const { cloneDeep } = require("lodash/fp");
 const { processObject } = require("@budibase/string-templates");
 const { getAllApps, isDevAppID, getDeployedAppID, Replication, } = require("@budibase/auth/db");
@@ -350,8 +349,5 @@ const createEmptyAppPackage = (ctx, app) => __awaiter(void 0, void 0, void 0, fu
         const cloned = cloneDeep(layout);
         screensAndLayouts.push(yield processObject(cloned, app));
     }
-    const homeScreen = createHomeScreen(app);
-    homeScreen._id = generateScreenID();
-    screensAndLayouts.push(homeScreen);
     yield db.bulkDocs(screensAndLayouts);
 });

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

@@ -167,8 +167,8 @@ var External;
         }
         return row;
     }
-    function isMany(field) {
-        return (field.relationshipType && field.relationshipType.split("-")[0] === "many");
+    function isOneSide(field) {
+        return (field.relationshipType && field.relationshipType.split("-")[0] === "one");
     }
     class ExternalRequest {
         constructor(appId, operation, tableId, datasource) {
@@ -226,24 +226,35 @@ var External;
                 const linkTable = this.tables[linkTableName];
                 // @ts-ignore
                 const linkTablePrimary = linkTable.primary[0];
-                if (!isMany(field)) {
+                // one to many
+                if (isOneSide(field)) {
                     newRow[field.foreignKey || linkTablePrimary] = utils_1.breakRowIdField(row[key][0])[0];
                 }
-                else {
+                // many to many
+                else if (field.through) {
                     // we're not inserting a doc, will be a bunch of update calls
-                    const isUpdate = !field.through;
-                    const thisKey = isUpdate
-                        ? "id"
-                        : field.throughTo || linkTablePrimary;
-                    // @ts-ignore
-                    const otherKey = isUpdate
-                        ? field.fieldName
-                        : field.throughFrom || tablePrimary;
+                    const otherKey = field.throughFrom || linkTablePrimary;
+                    const thisKey = field.throughTo || tablePrimary;
                     row[key].map((relationship) => {
-                        // we don't really support composite keys for relationships, this is why [0] is used
                         manyRelationships.push({
                             tableId: field.through || field.tableId,
-                            isUpdate,
+                            isUpdate: false,
+                            key: otherKey,
+                            [otherKey]: utils_1.breakRowIdField(relationship)[0],
+                            // leave the ID for enrichment later
+                            [thisKey]: `{{ literal ${tablePrimary} }}`,
+                        });
+                    });
+                }
+                // many to one
+                else {
+                    const thisKey = "id";
+                    // @ts-ignore
+                    const otherKey = field.fieldName;
+                    row[key].map((relationship) => {
+                        manyRelationships.push({
+                            tableId: field.tableId,
+                            isUpdate: true,
                             key: otherKey,
                             [thisKey]: utils_1.breakRowIdField(relationship)[0],
                             // leave the ID for enrichment later
@@ -351,8 +362,8 @@ var External;
                     const { tableName: throughTableName } = breakExternalTableId(field.through);
                     definition.through = throughTableName;
                     // don't support composite keys for relationships
-                    definition.from = field.throughFrom || table.primary[0];
-                    definition.to = field.throughTo || linkTable.primary[0];
+                    definition.from = field.throughTo || table.primary[0];
+                    definition.to = field.throughFrom || linkTable.primary[0];
                     definition.fromPrimary = table.primary[0];
                     definition.toPrimary = linkTable.primary[0];
                 }
@@ -374,24 +385,34 @@ var External;
                 // make a new request to get the row with all its relationships
                 // we need this to work out if any relationships need removed
                 for (let field of Object.values(table.schema)) {
-                    if (field.type !== FieldTypes.LINK || !field.fieldName) {
+                    if (field.type !== FieldTypes.LINK ||
+                        !field.fieldName ||
+                        isOneSide(field)) {
                         continue;
                     }
                     const isMany = field.relationshipType === RelationshipTypes.MANY_TO_MANY;
                     const tableId = isMany ? field.through : field.tableId;
-                    const manyKey = field.throughFrom || primaryKey;
+                    const { tableName: relatedTableName } = breakExternalTableId(tableId);
+                    // @ts-ignore
+                    const linkPrimaryKey = this.tables[relatedTableName].primary[0];
+                    const manyKey = field.throughTo || primaryKey;
+                    const lookupField = isMany ? primaryKey : field.foreignKey;
                     const fieldName = isMany ? manyKey : field.fieldName;
+                    if (!lookupField || !row[lookupField]) {
+                        continue;
+                    }
                     const response = yield getDatasourceAndQuery(this.appId, {
                         endpoint: getEndpoint(tableId, DataSourceOperation.READ),
                         filters: {
                             equal: {
-                                [fieldName]: row[primaryKey],
+                                [fieldName]: row[lookupField],
                             },
                         },
                     });
                     // this is the response from knex if no rows found
                     const rows = !response[0].read ? response : [];
-                    related[fieldName] = { rows, isMany, tableId };
+                    const storeTo = isMany ? field.throughFrom || linkPrimaryKey : manyKey;
+                    related[storeTo] = { rows, isMany, tableId };
                 }
                 return related;
             });

package/dist/integrations/base/sql.js

@@ -24,6 +24,9 @@ function parse(input) {
     if (Array.isArray(input)) {
         return JSON.stringify(input);
     }
+    if (input == undefined) {
+        return null;
+    }
     if (typeof input !== "string") {
         return input;
     }
@@ -45,6 +48,9 @@ function parseBody(body) {
     return body;
 }
 function parseFilters(filters) {
+    if (!filters) {
+        return {};
+    }
     for (let [key, value] of Object.entries(filters)) {
         let parsed;
         if (typeof value === "object") {
@@ -144,6 +150,23 @@ class InternalBuilder {
         }
         return query;
     }
+    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 (this.client === utils_1.SqlClients.MS_SQL && !sort && (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]}`);
+        }
+        return query;
+    }
     addRelationships(knex, query, fields, fromTable, relationships) {
         if (!relationships) {
             return query;
@@ -194,7 +217,6 @@ class InternalBuilder {
         return query.insert(parsedBody);
     }
     read(knex, json, limit) {
-        var _a, _b;
         let { endpoint, resource, filters, sort, paginate, relationships } = json;
         const tableName = endpoint.entityId;
         // select all if not specified
@@ -226,22 +248,18 @@ class InternalBuilder {
         if (foundOffset) {
             query = query.offset(foundOffset);
         }
-        if (sort) {
-            for (let [key, value] of Object.entries(sort)) {
-                const direction = value === datasource_1.SortDirection.ASCENDING ? "asc" : "desc";
-                query = query.orderBy(key, direction);
-            }
-        }
-        if (this.client === utils_1.SqlClients.MS_SQL && !sort && (paginate === null || paginate === void 0 ? void 0 : paginate.limit)) {
-            // @ts-ignore
-            query = query.orderBy((_b = (_a = json.meta) === null || _a === void 0 ? void 0 : _a.table) === null || _b === void 0 ? void 0 : _b.primary[0]);
-        }
         query = this.addFilters(tableName, query, filters);
+        // add sorting to pre-query
+        query = this.addSorting(query, json);
         // @ts-ignore
         let preQuery = knex({
             // @ts-ignore
             [tableName]: query,
         }).select(selectStatement);
+        // have to add after as well (this breaks MS-SQL)
+        if (this.client !== utils_1.SqlClients.MS_SQL) {
+            preQuery = this.addSorting(preQuery, json);
+        }
         // handle joins
         return this.addRelationships(knex, preQuery, selectStatement, tableName, relationships);
     }

package/dist/integrations/index.js

@@ -38,7 +38,7 @@ const INTEGRATIONS = {
     [SourceNames.REST]: rest.integration,
 };
 // optionally add oracle integration if the oracle binary can be installed
-if (!(process.arch === 'arm64' && process.platform === 'darwin')) {
+if (!(process.arch === "arm64" && process.platform === "darwin")) {
     const oracle = require("./oracle");
     DEFINITIONS[SourceNames.ORACLE] = oracle.schema;
     INTEGRATIONS[SourceNames.ORACLE] = oracle.integration;

package/dist/integrations/mysql.js

@@ -102,7 +102,8 @@ var MySQLModule;
                 this.client.connect();
                 // get the tables first
                 const tablesResp = yield internalQuery(this.client, { sql: "SHOW TABLES;" }, false);
-                const tableNames = tablesResp.map((obj) => obj[`Tables_in_${database.toLowerCase()}`]);
+                const tableNames = tablesResp.map((obj) => obj[`Tables_in_${database}`] ||
+                    obj[`Tables_in_${database.toLowerCase()}`]);
                 for (let tableName of tableNames) {
                     const primaryKeys = [];
                     const schema = {};

package/dist/integrations/oracle.js

@@ -269,7 +269,8 @@ var OracleModule;
         addReturning(query, bindings, returnColumn) {
             if (bindings instanceof Array) {
                 bindings.push({ dir: oracledb_1.default.BIND_OUT });
-                query.sql = query.sql + ` returning \"${returnColumn}\" into :${bindings.length}`;
+                query.sql =
+                    query.sql + ` returning \"${returnColumn}\" into :${bindings.length}`;
             }
         }
         internalQuery(query, returnColum, operation) {
@@ -279,7 +280,8 @@ var OracleModule;
                     connection = yield this.getConnection();
                     const options = { autoCommit: true };
                     const bindings = query.bindings || [];
-                    if (returnColum && (operation === datasource_1.Operation.CREATE || operation === datasource_1.Operation.UPDATE)) {
+                    if (returnColum &&
+                        (operation === datasource_1.Operation.CREATE || operation === datasource_1.Operation.UPDATE)) {
                         this.addReturning(query, bindings, returnColum);
                     }
                     const result = yield connection.execute(query.sql, bindings, options);
@@ -332,7 +334,7 @@ var OracleModule;
                 const primaryKeys = json.meta.table.primary;
                 const primaryKey = primaryKeys ? primaryKeys[0] : undefined;
                 const queryFn = (query, operation) => this.internalQuery(query, primaryKey, operation);
-                const processFn = (response) => response.rows ? response.rows : [];
+                const processFn = (response) => (response.rows ? response.rows : []);
                 const output = yield this.queryWithReturning(json, queryFn, processFn);
                 return output;
             });

package/dist/integrations/utils.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.finaliseExternalTables = exports.isIsoDateString = exports.isSQL = exports.getSqlQuery = exports.convertSqlType = exports.breakRowIdField = exports.convertRowId = exports.isRowId = exports.generateRowIdField = exports.breakExternalTableId = exports.buildExternalTableId = exports.isExternalTable = exports.SqlClients = void 0;
 const datasource_1 = require("../definitions/datasource");
 const { DocumentTypes, SEPARATOR } = require("../db/utils");
-const { FieldTypes, BuildSchemaErrors, InvalidColumns } = require("../constants");
+const { FieldTypes, BuildSchemaErrors, InvalidColumns, } = require("../constants");
 const DOUBLE_SEPARATOR = `${SEPARATOR}${SEPARATOR}`;
 const ROW_ID_REGEX = /^\[.*]$/g;
 const SQL_TYPE_MAP = {

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "0.9.189",
+    "version": "0.9.190-alpha.3",
     "description": "Budibase Web Server",
     "main": "src/index.js",
     "repository": {
@@ -68,11 +68,11 @@
     "author": "Budibase",
     "license": "GPL-3.0",
     "dependencies": {
+        "@budibase/auth": "^0.9.190-alpha.3",
+        "@budibase/client": "^0.9.190-alpha.3",
+        "@budibase/string-templates": "^0.9.190-alpha.3",
         "@bull-board/api": "^3.7.0",
         "@bull-board/koa": "^3.7.0",
-        "@budibase/auth": "^0.9.189",
-        "@budibase/client": "^0.9.189",
-        "@budibase/string-templates": "^0.9.189",
         "@elastic/elasticsearch": "7.10.0",
         "@koa/router": "8.0.0",
         "@sendgrid/mail": "7.1.1",