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

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") {
@@ -78,7 +84,7 @@ class InternalBuilder {
         if (filters.oneOf) {
             iterate(filters.oneOf, (key, array) => {
                 const fnc = allOr ? "orWhereIn" : "whereIn";
-                query = query[fnc](key, array);
+                query = query[fnc](key, Array.isArray(array) ? array : [array]);
             });
         }
         if (filters.string) {
@@ -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);
     }
@@ -379,9 +397,6 @@ class SqlQueryBuilder extends sqlTable_1.default {
                 else if (sqlClient === utils_1.SqlClients.MY_SQL) {
                     id = results === null || results === void 0 ? void 0 : results.insertId;
                 }
-                else if (sqlClient === utils_1.SqlClients.ORACLE) {
-                    id = response.outBinds[0][0];
-                }
                 row = processFn(yield this.getReturningRow(queryFn, this.checkLookupKeys(id, json)));
             }
             if (operation !== datasource_1.Operation.READ) {

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

@@ -262,26 +262,13 @@ var OracleModule;
                 this.schemaErrors = final.errors;
             });
         }
-        /**
-         * Knex default returning behaviour does not work with oracle
-         * Manually add the behaviour for the return column
-         */
-        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}`;
-            }
-        }
-        internalQuery(query, returnColum, operation) {
+        internalQuery(query) {
             return __awaiter(this, void 0, void 0, function* () {
                 let connection;
                 try {
                     connection = yield this.getConnection();
                     const options = { autoCommit: true };
                     const bindings = query.bindings || [];
-                    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);
                     return result;
                 }
@@ -328,13 +315,48 @@ var OracleModule;
             });
         }
         query(json) {
+            var _a, _b, _c;
             return __awaiter(this, void 0, void 0, function* () {
-                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 output = yield this.queryWithReturning(json, queryFn, processFn);
-                return output;
+                const operation = this._operation(json);
+                const input = this._query(json, { disableReturning: true });
+                if (Array.isArray(input)) {
+                    const responses = [];
+                    for (let query of input) {
+                        responses.push(yield this.internalQuery(query));
+                    }
+                    return responses;
+                }
+                else {
+                    // read the row to be deleted up front for the return
+                    let deletedRows;
+                    if (operation === datasource_1.Operation.DELETE) {
+                        const queryFn = (query) => this.internalQuery(query);
+                        deletedRows = yield this.getReturningRow(queryFn, json);
+                    }
+                    // run the query
+                    const response = yield this.internalQuery(input);
+                    // get the results or return the created / updated / deleted row
+                    if ((_a = deletedRows === null || deletedRows === void 0 ? void 0 : deletedRows.rows) === null || _a === void 0 ? void 0 : _a.length) {
+                        return deletedRows.rows;
+                    }
+                    else if ((_b = response.rows) === null || _b === void 0 ? void 0 : _b.length) {
+                        return response.rows;
+                    }
+                    else {
+                        // get the last row that was updated
+                        if (response.lastRowid &&
+                            ((_c = json.endpoint) === null || _c === void 0 ? void 0 : _c.entityId) &&
+                            operation !== datasource_1.Operation.DELETE) {
+                            const lastRow = yield this.internalQuery({
+                                sql: `SELECT * FROM \"${json.endpoint.entityId}\" WHERE ROWID = '${response.lastRowid}'`,
+                            });
+                            return lastRow.rows;
+                        }
+                        else {
+                            return [{ [operation.toLowerCase()]: true }];
+                        }
+                    }
+                }
             });
         }
     }

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,9 +1,9 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "0.9.189",
+    "version": "0.9.190-alpha.11",
     "description": "Budibase Web Server",
-    "main": "src/index.js",
+    "main": "src/index.ts",
     "repository": {
         "type": "git",
         "url": "https://github.com/Budibase/budibase.git"
@@ -15,6 +15,7 @@
         "test:watch": "jest --watch",
         "predocker": "copyfiles -f ../client/dist/budibase-client.js ../client/manifest.json client",
         "build:docker": "yarn run predocker && docker build . -t app-service --label version=$BUDIBASE_RELEASE_VERSION",
+        "build:docs": "node ./scripts/docs/generate.js open",
         "run:docker": "node dist/index.js",
         "dev:stack:up": "node scripts/dev/manage.js up",
         "dev:stack:down": "node scripts/dev/manage.js down",
@@ -68,11 +69,11 @@
     "author": "Budibase",
     "license": "GPL-3.0",
     "dependencies": {
+        "@budibase/auth": "^0.9.190-alpha.11",
+        "@budibase/client": "^0.9.190-alpha.11",
+        "@budibase/string-templates": "^0.9.190-alpha.11",
         "@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",
@@ -106,7 +107,7 @@
         "mssql": "6.2.3",
         "mysql2": "^2.3.1",
         "node-fetch": "2.6.0",
-        "open": "7.3.0",
+        "open": "^8.4.0",
         "pg": "8.5.1",
         "pino-pretty": "4.0.0",
         "posthog-node": "^1.1.4",
@@ -130,6 +131,7 @@
         "@babel/preset-env": "^7.14.4",
         "@budibase/standard-components": "^0.9.139",
         "@jest/test-sequencer": "^24.8.0",
+        "@types/apidoc": "^0.50.0",
         "@types/bull": "^3.15.1",
         "@types/jest": "^26.0.23",
         "@types/koa": "^2.13.3",
@@ -137,12 +139,14 @@
         "@types/node": "^15.12.4",
         "@types/oracledb": "^5.2.1",
         "@typescript-eslint/parser": "4.28.0",
+        "apidoc": "^0.50.2",
         "babel-jest": "^27.0.2",
         "copyfiles": "^2.4.1",
         "docker-compose": "^0.23.6",
         "eslint": "^6.8.0",
         "jest": "^27.0.5",
         "nodemon": "^2.0.4",
+        "path-to-regexp": "^6.2.0",
         "prettier": "^2.3.1",
         "rimraf": "^3.0.2",
         "supertest": "^4.0.2",