@budibase/server 0.9.185-alpha.13 → 0.9.185-alpha.17

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

@@ -136,9 +136,13 @@ exports.save = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const appId = ctx.appId;
         const table = ctx.request.body;
-        // can't do this
+        // can't do this right now
         delete table.dataImport;
         const datasourceId = getDatasourceId(ctx.request.body);
+        // table doesn't exist already, note that it is created
+        if (!table._id) {
+            table.created = true;
+        }
         let tableToSave = Object.assign({ type: "table", _id: buildExternalTableId(datasourceId, table.name) }, table);
         let oldTable;
         if (ctx.request.body && ctx.request.body._id) {
@@ -213,6 +217,9 @@ exports.destroy = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const appId = ctx.appId;
         const tableToDelete = yield getTable(appId, ctx.params.tableId);
+        if (!tableToDelete || !tableToDelete.created) {
+            ctx.throw(400, "Cannot delete tables which weren't created in Budibase.");
+        }
         const datasourceId = getDatasourceId(tableToDelete);
         const db = new CouchDB(appId);
         const datasource = yield db.get(datasourceId);

package/dist/definitions/datasource.js

@@ -48,6 +48,7 @@ var SourceNames;
     SourceNames["MYSQL"] = "MYSQL";
     SourceNames["ARANGODB"] = "ARANGODB";
     SourceNames["REST"] = "REST";
+    SourceNames["ORACLE"] = "ORACLE";
 })(SourceNames = exports.SourceNames || (exports.SourceNames = {}));
 var IncludeRelationships;
 (function (IncludeRelationships) {

package/dist/environment.js

@@ -16,6 +16,7 @@ if (!LOADED && isDev() && !isTest()) {
     require("dotenv").config();
     LOADED = true;
 }
+let inThread = false;
 module.exports = {
     // important
     PORT: process.env.PORT,
@@ -55,6 +56,7 @@ module.exports = {
     USERID_API_KEY: process.env.USERID_API_KEY,
     DEPLOYMENT_CREDENTIALS_URL: process.env.DEPLOYMENT_CREDENTIALS_URL,
     ALLOW_DEV_AUTOMATIONS: process.env.ALLOW_DEV_AUTOMATIONS,
+    DISABLE_THREADING: process.env.DISABLE_THREADING,
     _set(key, value) {
         process.env[key] = value;
         module.exports[key] = value;
@@ -65,7 +67,18 @@ module.exports = {
     isProd: () => {
         return !isDev();
     },
+    // used to check if already in a thread, don't thread further
+    setInThread: () => {
+        inThread = true;
+    },
+    isInThread: () => {
+        return inThread;
+    },
 };
+// threading can cause memory issues with node-ts in development
+if (isDev() && module.exports.DISABLE_THREADING == null) {
+    module.exports._set("DISABLE_THREADING", "1");
+}
 // clean up any environment variable edge cases
 for (let [key, value] of Object.entries(module.exports)) {
     // handle the edge case of "0" to disable an environment variable

package/dist/integrations/base/sql.js

@@ -379,6 +379,9 @@ 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) {
@@ -388,4 +391,5 @@ class SqlQueryBuilder extends sqlTable_1.default {
         });
     }
 }
+exports.default = SqlQueryBuilder;
 module.exports = SqlQueryBuilder;

package/dist/integrations/index.js

@@ -37,6 +37,12 @@ const INTEGRATIONS = {
     [SourceNames.ARANGODB]: arangodb.integration,
     [SourceNames.REST]: rest.integration,
 };
+// optionally add oracle integration if the oracle binary can be installed
+if (!(process.arch === 'arm64' && process.platform === 'darwin')) {
+    const oracle = require("./oracle");
+    DEFINITIONS[SourceNames.ORACLE] = oracle.schema;
+    INTEGRATIONS[SourceNames.ORACLE] = oracle.integration;
+}
 module.exports = {
     definitions: DEFINITIONS,
     integrations: INTEGRATIONS,

package/dist/integrations/oracle.js

@@ -0,0 +1,345 @@
+"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());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const datasource_1 = require("../definitions/datasource");
+const utils_1 = require("./utils");
+const oracledb_1 = __importDefault(require("oracledb"));
+const sql_1 = __importDefault(require("./base/sql"));
+const constants_1 = require("../constants");
+var OracleModule;
+(function (OracleModule) {
+    oracledb_1.default.outFormat = oracledb_1.default.OUT_FORMAT_OBJECT;
+    const SCHEMA = {
+        docs: "https://github.com/oracle/node-oracledb",
+        plus: true,
+        friendlyName: "Oracle",
+        description: "Oracle Database is an object-relational database management system developed by Oracle Corporation",
+        datasource: {
+            host: {
+                type: datasource_1.DatasourceFieldTypes.STRING,
+                default: "localhost",
+                required: true,
+            },
+            port: {
+                type: datasource_1.DatasourceFieldTypes.NUMBER,
+                required: true,
+                default: 1521,
+            },
+            database: {
+                type: datasource_1.DatasourceFieldTypes.STRING,
+                required: true,
+            },
+            user: {
+                type: datasource_1.DatasourceFieldTypes.STRING,
+                required: true,
+            },
+            password: {
+                type: datasource_1.DatasourceFieldTypes.PASSWORD,
+                required: true,
+            },
+        },
+        query: {
+            create: {
+                type: datasource_1.QueryTypes.SQL,
+            },
+            read: {
+                type: datasource_1.QueryTypes.SQL,
+            },
+            update: {
+                type: datasource_1.QueryTypes.SQL,
+            },
+            delete: {
+                type: datasource_1.QueryTypes.SQL,
+            },
+        },
+    };
+    const UNSUPPORTED_TYPES = ["BLOB", "CLOB", "NCLOB"];
+    const OracleContraintTypes = {
+        PRIMARY: "P",
+        NOT_NULL_OR_CHECK: "C",
+        FOREIGN_KEY: "R",
+        UNIQUE: "U",
+    };
+    class OracleIntegration extends sql_1.default {
+        constructor(config) {
+            super(utils_1.SqlClients.ORACLE);
+            this.tables = {};
+            this.schemaErrors = {};
+            this.COLUMNS_SQL = `
+      SELECT
+        tabs.table_name,
+        cols.column_name,
+        cols.data_type,
+        cols.data_default,
+        cols.column_id,
+        cons.constraint_name,
+        cons.constraint_type,
+        cons.r_constraint_name,
+        cons.search_condition
+      FROM
+        user_tables tabs
+      JOIN 
+        user_tab_columns cols
+        ON tabs.table_name = cols.table_name 
+      LEFT JOIN 
+        user_cons_columns col_cons
+        ON cols.column_name = col_cons.column_name
+        AND cols.table_name = col_cons.table_name
+      LEFT JOIN 
+        user_constraints cons
+        ON col_cons.constraint_name = cons.constraint_name
+        AND cons.table_name = cols.table_name
+      WHERE
+        (cons.status = 'ENABLED'
+          OR cons.status IS NULL)
+    `;
+            this.getConnection = () => __awaiter(this, void 0, void 0, function* () {
+                //connectString : "(DESCRIPTION =(ADDRESS = (PROTOCOL = TCP)(HOST = localhost)(PORT = 1521))(CONNECT_DATA =(SID= ORCL)))"
+                const connectString = `${this.config.host}:${this.config.port || 1521}/${this.config.database}`;
+                const attributes = {
+                    user: this.config.user,
+                    password: this.config.user,
+                    connectString,
+                };
+                return oracledb_1.default.getConnection(attributes);
+            });
+            this.config = config;
+        }
+        /**
+         * Map the flat tabular columns and constraints data into a nested object
+         */
+        mapColumns(result) {
+            const oracleTables = {};
+            if (result.rows) {
+                result.rows.forEach(row => {
+                    const tableName = row.TABLE_NAME;
+                    const columnName = row.COLUMN_NAME;
+                    const dataType = row.DATA_TYPE;
+                    const dataDefault = row.DATA_DEFAULT;
+                    const columnId = row.COLUMN_ID;
+                    const constraintName = row.CONSTRAINT_NAME;
+                    const constraintType = row.CONSTRAINT_TYPE;
+                    const relatedConstraintName = row.R_CONSTRAINT_NAME;
+                    const searchCondition = row.SEARCH_CONDITION;
+                    let table = oracleTables[tableName];
+                    if (!table) {
+                        table = {
+                            name: tableName,
+                            columns: {},
+                        };
+                        oracleTables[tableName] = table;
+                    }
+                    let column = table.columns[columnName];
+                    if (!column) {
+                        column = {
+                            name: columnName,
+                            type: dataType,
+                            default: dataDefault,
+                            id: columnId,
+                            constraints: {},
+                        };
+                        table.columns[columnName] = column;
+                    }
+                    if (constraintName && constraintType) {
+                        let constraint = column.constraints[constraintName];
+                        if (!constraint) {
+                            constraint = {
+                                name: constraintName,
+                                type: constraintType,
+                                relatedConstraintName: relatedConstraintName,
+                                searchCondition: searchCondition,
+                            };
+                        }
+                        column.constraints[constraintName] = constraint;
+                    }
+                });
+            }
+            return oracleTables;
+        }
+        isSupportedColumn(column) {
+            if (UNSUPPORTED_TYPES.includes(column.type)) {
+                return false;
+            }
+            return true;
+        }
+        isAutoColumn(column) {
+            if (column.default && column.default.toLowerCase().includes("nextval")) {
+                return true;
+            }
+            return false;
+        }
+        /**
+         * No native boolean in oracle. Best we can do is to check if a manual 1 or 0 number constraint has been set up
+         * This matches the default behaviour for generating DDL used in knex.
+         */
+        isBooleanType(column) {
+            if (column.type.toLowerCase() === "number" &&
+                Object.values(column.constraints).filter(c => {
+                    if (c.type === OracleContraintTypes.NOT_NULL_OR_CHECK &&
+                        c.searchCondition) {
+                        const condition = c.searchCondition
+                            .replace(/\s/g, "") // remove spaces
+                            .replace(/[']+/g, ""); // remove quotes
+                        if (condition.includes("in(0,1)") ||
+                            condition.includes("in(1,0)")) {
+                            return true;
+                        }
+                    }
+                    return false;
+                }).length > 0) {
+                return true;
+            }
+            return false;
+        }
+        internalConvertType(column) {
+            if (this.isBooleanType(column)) {
+                return constants_1.FieldTypes.BOOLEAN;
+            }
+            return utils_1.convertSqlType(column.type);
+        }
+        /**
+         * Fetches the tables from the oracle table and assigns them to the datasource.
+         * @param {*} datasourceId - datasourceId to fetch
+         * @param entities - the tables that are to be built
+         */
+        buildSchema(datasourceId, entities) {
+            return __awaiter(this, void 0, void 0, function* () {
+                const columnsResponse = yield this.internalQuery({
+                    sql: this.COLUMNS_SQL,
+                });
+                const oracleTables = this.mapColumns(columnsResponse);
+                const tables = {};
+                // iterate each table
+                Object.values(oracleTables).forEach(oracleTable => {
+                    let table = tables[oracleTable.name];
+                    if (!table) {
+                        table = {
+                            _id: utils_1.buildExternalTableId(datasourceId, oracleTable.name),
+                            primary: [],
+                            name: oracleTable.name,
+                            schema: {},
+                        };
+                        tables[oracleTable.name] = table;
+                    }
+                    // iterate each column on the table
+                    Object.values(oracleTable.columns)
+                        // remove columns that we can't read / save
+                        .filter(oracleColumn => this.isSupportedColumn(oracleColumn))
+                        // match the order of the columns in the db
+                        .sort((c1, c2) => c1.id - c2.id)
+                        .forEach(oracleColumn => {
+                        const columnName = oracleColumn.name;
+                        let fieldSchema = table.schema[columnName];
+                        if (!fieldSchema) {
+                            fieldSchema = {
+                                autocolumn: this.isAutoColumn(oracleColumn),
+                                name: columnName,
+                                type: this.internalConvertType(oracleColumn),
+                            };
+                            table.schema[columnName] = fieldSchema;
+                        }
+                        // iterate each constraint on the column
+                        Object.values(oracleColumn.constraints).forEach(oracleConstraint => {
+                            if (oracleConstraint.type === OracleContraintTypes.PRIMARY) {
+                                table.primary.push(columnName);
+                            }
+                        });
+                    });
+                });
+                const final = utils_1.finaliseExternalTables(tables, entities);
+                this.tables = final.tables;
+                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) {
+            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;
+                }
+                finally {
+                    if (connection) {
+                        try {
+                            yield connection.close();
+                        }
+                        catch (err) {
+                            console.error(err);
+                        }
+                    }
+                }
+            });
+        }
+        create(query) {
+            return __awaiter(this, void 0, void 0, function* () {
+                const response = yield this.internalQuery(utils_1.getSqlQuery(query));
+                return response.rows && response.rows.length
+                    ? response.rows
+                    : [{ created: true }];
+            });
+        }
+        read(query) {
+            return __awaiter(this, void 0, void 0, function* () {
+                const response = yield this.internalQuery(utils_1.getSqlQuery(query));
+                return response.rows ? response.rows : [];
+            });
+        }
+        update(query) {
+            return __awaiter(this, void 0, void 0, function* () {
+                const response = yield this.internalQuery(utils_1.getSqlQuery(query));
+                return response.rows && response.rows.length
+                    ? response.rows
+                    : [{ updated: true }];
+            });
+        }
+        delete(query) {
+            return __awaiter(this, void 0, void 0, function* () {
+                const response = yield this.internalQuery(utils_1.getSqlQuery(query));
+                return response.rows && response.rows.length
+                    ? response.rows
+                    : [{ deleted: true }];
+            });
+        }
+        query(json) {
+            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;
+            });
+        }
+    }
+    module.exports = {
+        schema: SCHEMA,
+        integration: OracleIntegration,
+    };
+})(OracleModule || (OracleModule = {}));

package/dist/integrations/utils.js

@@ -31,12 +31,17 @@ const SQL_TYPE_MAP = {
     fixed: FieldTypes.NUMBER,
     datetime: FieldTypes.DATETIME,
     tinyint: FieldTypes.BOOLEAN,
+    long: FieldTypes.LONGFORM,
+    number: FieldTypes.NUMBER,
+    binary_float: FieldTypes.NUMBER,
+    binary_double: FieldTypes.NUMBER,
 };
 var SqlClients;
 (function (SqlClients) {
     SqlClients["MS_SQL"] = "mssql";
     SqlClients["POSTGRES"] = "pg";
     SqlClients["MY_SQL"] = "mysql";
+    SqlClients["ORACLE"] = "oracledb";
 })(SqlClients = exports.SqlClients || (exports.SqlClients = {}));
 function isExternalTable(tableId) {
     return tableId.includes(DocumentTypes.DATASOURCE);
@@ -152,7 +157,7 @@ function copyExistingPropsOver(tableName, table, entities) {
 }
 function finaliseExternalTables(tables, entities) {
     const invalidColumns = Object.values(InvalidColumns);
-    const finalTables = {};
+    let finalTables = {};
     const errors = {};
     for (let [name, table] of Object.entries(tables)) {
         const schemaFields = Object.keys(table.schema);
@@ -168,6 +173,10 @@ function finaliseExternalTables(tables, entities) {
         // make sure all previous props have been added back
         finalTables[name] = copyExistingPropsOver(name, table, entities);
     }
+    // sort the tables by name
+    finalTables = Object.entries(finalTables)
+        .sort(([a], [b]) => a.localeCompare(b))
+        .reduce((r, [k, v]) => (Object.assign(Object.assign({}, r), { [k]: v })), {});
     return { tables: finalTables, errors };
 }
 exports.finaliseExternalTables = finaliseExternalTables;

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "0.9.185-alpha.12",
+    "version": "0.9.185-alpha.16",
     "description": "Budibase Web Server",
     "main": "src/index.js",
     "repository": {
@@ -68,9 +68,9 @@
     "author": "Budibase",
     "license": "AGPL-3.0-or-later",
     "dependencies": {
-        "@budibase/auth": "^0.9.185-alpha.12",
-        "@budibase/client": "^0.9.185-alpha.12",
-        "@budibase/string-templates": "^0.9.185-alpha.12",
+        "@budibase/auth": "^0.9.185-alpha.16",
+        "@budibase/client": "^0.9.185-alpha.16",
+        "@budibase/string-templates": "^0.9.185-alpha.16",
         "@bull-board/api": "^3.7.0",
         "@bull-board/koa": "^3.7.0",
         "@elastic/elasticsearch": "7.10.0",
@@ -135,6 +135,7 @@
         "@types/koa": "^2.13.3",
         "@types/koa-router": "^7.4.2",
         "@types/node": "^15.12.4",
+        "@types/oracledb": "^5.2.1",
         "@typescript-eslint/parser": "4.28.0",
         "babel-jest": "^27.0.2",
         "copyfiles": "^2.4.1",
@@ -150,5 +151,8 @@
         "typescript": "^4.3.5",
         "update-dotenv": "^1.1.1"
     },
+    "optionalDependencies": {
+        "oracledb": "^5.3.0"
+    },
     "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc"
 }

package/dist/threads/automation.js

@@ -8,6 +8,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+// when thread starts, make sure it is recorded
+const env = require("../environment");
+env.setInThread();
 const actions = require("../automations/actions");
 const automationUtils = require("../automations/automationUtils");
 const AutomationEmitter = require("../events/AutomationEmitter");
@@ -16,7 +19,6 @@ const { DEFAULT_TENANT_ID } = require("@budibase/auth").constants;
 const CouchDB = require("../db");
 const { DocumentTypes, isDevAppID } = require("../db/utils");
 const { doInTenant } = require("@budibase/auth/tenancy");
-const env = require("../environment");
 const usage = require("../utilities/usageQuota");
 const { definitions: triggerDefs } = require("../automations/triggerInfo");
 const FILTER_STEP_ID = actions.ACTION_DEFINITIONS.FILTER.stepId;

package/dist/threads/index.js

@@ -22,10 +22,16 @@ function typeToFile(type) {
 class Thread {
     constructor(type, opts = { timeoutMs: null, count: 1 }) {
         this.type = type;
-        if (!env.isTest()) {
+        this.count = opts.count ? opts.count : 1;
+        this.disableThreading =
+            env.isTest() ||
+                env.DISABLE_THREADING ||
+                this.count === 0 ||
+                env.isInThread();
+        if (!this.disableThreading) {
             const workerOpts = {
                 autoStart: true,
-                maxConcurrentWorkers: opts.count ? opts.count : 1,
+                maxConcurrentWorkers: this.count,
             };
             if (opts.timeoutMs) {
                 workerOpts.maxCallTime = opts.timeoutMs;
@@ -37,7 +43,7 @@ class Thread {
         return new Promise((resolve, reject) => {
             let fncToCall;
             // if in test then don't use threading
-            if (env.isTest()) {
+            if (this.disableThreading) {
                 fncToCall = require(typeToFile(this.type));
             }
             else {

package/dist/threads/query.js

@@ -8,6 +8,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+// when thread starts, make sure it is recorded
+const env = require("../environment");
+env.setInThread();
 const ScriptRunner = require("../utilities/scriptRunner");
 const { integrations } = require("../integrations");
 function formatResponse(resp) {