@budibase/server 1.0.212-alpha.9 → 1.0.214

package/dist/api/controllers/backup.js

@@ -13,12 +13,11 @@ const { events, context } = require("@budibase/backend-core");
 const { DocumentTypes } = require("../../db/utils");
 exports.exportAppDump = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        let { appId, excludeRows } = ctx.query;
+        const { appId } = ctx.query;
         const appName = decodeURI(ctx.query.appname);
-        excludeRows = excludeRows === "true";
         const backupIdentifier = `${appName}-export-${new Date().getTime()}.txt`;
         ctx.attachment(backupIdentifier);
-        ctx.body = yield streamBackup(appId, excludeRows);
+        ctx.body = yield streamBackup(appId);
         yield context.doInAppContext(appId, () => __awaiter(this, void 0, void 0, function* () {
             const appDb = context.getAppDB();
             const app = yield appDb.get(DocumentTypes.APP_METADATA);

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

@@ -155,41 +155,29 @@ exports.validate = () => __awaiter(void 0, void 0, void 0, function* () {
     return { valid: true };
 });
 exports.exportRows = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
-    const { datasourceId } = breakExternalTableId(ctx.params.tableId);
+    const { datasourceId, tableName } = breakExternalTableId(ctx.params.tableId);
     const db = getAppDB();
-    const format = ctx.query.format;
-    const { columns } = ctx.request.body;
+    let format = ctx.query.format;
     const datasource = yield db.get(datasourceId);
     if (!datasource || !datasource.entities) {
         ctx.throw(400, "Datasource has not been configured for plus API.");
     }
+    const tables = datasource.entities;
+    const table = tables[tableName];
     ctx.request.body = {
         query: {
             oneOf: {
-                _id: ctx.request.body.rows.map(row => JSON.parse(decodeURI(row))[0]),
+                [table.primaryDisplay]: ctx.request.body.rows.map(id => breakRowIdField(id)[0]),
             },
         },
     };
     let result = yield exports.search(ctx);
-    let rows = [];
-    // Filter data to only specified columns if required
-    if (columns && columns.length) {
-        for (let i = 0; i < result.rows.length; i++) {
-            rows[i] = {};
-            for (let column of columns) {
-                rows[i][column] = result.rows[i][column];
-            }
-        }
-    }
-    else {
-        rows = result.rows;
-    }
-    let headers = Object.keys(rows[0]);
+    let headers = Object.keys(result.rows[0]);
     const exporter = exporters[format];
     const filename = `export.${format}`;
     // send down the file
     ctx.attachment(filename);
-    return apiFileReturn(exporter(headers, rows));
+    return apiFileReturn(exporter(headers, result.rows));
 });
 exports.fetchEnrichedRow = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     const id = ctx.params.rowId;

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

@@ -18,7 +18,7 @@ const { getAppId } = require("@budibase/backend-core/context");
  */
 class QueryBuilder {
     constructor(base) {
-        this.query = Object.assign({ string: {}, fuzzy: {}, range: {}, equal: {}, notEqual: {}, empty: {}, notEmpty: {}, oneOf: {} }, base);
+        this.query = Object.assign({ string: {}, fuzzy: {}, range: {}, equal: {}, notEqual: {}, empty: {}, notEmpty: {} }, base);
         this.limit = 50;
         this.sortOrder = "ascending";
         this.sortType = "string";
@@ -96,10 +96,6 @@ class QueryBuilder {
         this.query.notEmpty[key] = value;
         return this;
     }
-    addOneOf(key, value) {
-        this.query.oneOf[key] = value;
-        return this;
-    }
     /**
      * Preprocesses a value before going into a lucene search.
      * Transforms strings to lowercase and wraps strings and bools in quotes.
@@ -205,23 +201,6 @@ class QueryBuilder {
         if (this.query.notEmpty) {
             build(this.query.notEmpty, key => `${key}:["" TO *]`);
         }
-        if (this.query.oneOf) {
-            build(this.query.oneOf, (key, value) => {
-                if (!Array.isArray(value)) {
-                    if (typeof value === "string") {
-                        value = value.split(",");
-                    }
-                    else {
-                        return "";
-                    }
-                }
-                let orStatement = `${builder.preprocess(value[0], allPreProcessingOpts)}`;
-                for (let i = 1; i < value.length; i++) {
-                    orStatement += ` OR ${builder.preprocess(value[i], allPreProcessingOpts)}`;
-                }
-                return `${key}:(${orStatement})`;
-            });
-        }
         return query;
     }
     buildSearchBody() {

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

@@ -70,9 +70,6 @@ exports.validate = ({ tableId, row, table }) => __awaiter(void 0, void 0, void 0
         // Validate.js doesn't seem to handle array
         if (type === FieldTypes.ARRAY && row[fieldName]) {
             if (row[fieldName].length) {
-                if (!Array.isArray(row[fieldName])) {
-                    row[fieldName] = row[fieldName].split(",");
-                }
                 row[fieldName].map(val => {
                     if (!constraints.inclusion.includes(val) &&
                         constraints.inclusion.length !== 0) {

package/dist/automations/automationUtils.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 const { getTable } = require("../api/controllers/table/utils");
-const { findHBSBlocks, decodeJSBinding, isJSBinding, encodeJSBinding, } = require("@budibase/string-templates");
+const { findHBSBlocks } = require("@budibase/string-templates");
 /**
  * When values are input to the system generally they will be of type string as this is required for template strings.
  * This can generate some odd scenarios as the Schema of the automation requires a number but the builder might supply
@@ -81,23 +81,11 @@ exports.getError = err => {
     return typeof err !== "string" ? err.toString() : err;
 };
 exports.substituteLoopStep = (hbsString, substitute) => {
-    let blocks = [];
-    let checkForJS = isJSBinding(hbsString);
-    if (checkForJS) {
-        hbsString = decodeJSBinding(hbsString);
-        blocks.push(hbsString);
-    }
-    else {
-        blocks = findHBSBlocks(hbsString);
-    }
+    let blocks = findHBSBlocks(hbsString);
     for (let block of blocks) {
+        let oldBlock = block;
         block = block.replace(/loop/, substitute);
-        if (checkForJS) {
-            hbsString = encodeJSBinding(block);
-        }
-        else {
-            hbsString = block;
-        }
+        hbsString = hbsString.replace(new RegExp(oldBlock, "g"), block);
     }
     return hbsString;
 };

package/dist/automations/triggers.js

@@ -95,7 +95,7 @@ exports.externalTrigger = function (automation, params, { getResponses } = {}) {
             // values are likely to be submitted as strings, so we shall convert to correct type
             const coercedFields = {};
             const fields = automation.definition.trigger.inputs.fields;
-            for (let key of Object.keys(fields || {})) {
+            for (let key of Object.keys(fields)) {
                 coercedFields[key] = coerce(params.fields[key], fields[key]);
             }
             params.fields = coercedFields;

package/dist/db/utils.js

@@ -54,7 +54,6 @@ exports.isDevAppID = isDevAppID;
 exports.isProdAppID = isProdAppID;
 exports.USER_METDATA_PREFIX = `${DocumentTypes.ROW}${SEPARATOR}${InternalTables.USER_METADATA}${SEPARATOR}`;
 exports.LINK_USER_METADATA_PREFIX = `${DocumentTypes.LINK}${SEPARATOR}${InternalTables.USER_METADATA}${SEPARATOR}`;
-exports.TABLE_ROW_PREFIX = `${DocumentTypes.ROW}${SEPARATOR}${DocumentTypes.TABLE}`;
 exports.ViewNames = ViewNames;
 exports.InternalTables = InternalTables;
 exports.DocumentTypes = DocumentTypes;

package/dist/definitions/datasource.js

@@ -52,7 +52,6 @@ var SourceNames;
     SourceNames["GOOGLE_SHEETS"] = "GOOGLE_SHEETS";
     SourceNames["FIRESTORE"] = "FIRESTORE";
     SourceNames["REDIS"] = "REDIS";
-    SourceNames["SNOWFLAKE"] = "SNOWFLAKE";
 })(SourceNames = exports.SourceNames || (exports.SourceNames = {}));
 var IncludeRelationships;
 (function (IncludeRelationships) {

package/dist/integrations/airtable.js

@@ -17,7 +17,6 @@ var AirtableModule;
         docs: "https://airtable.com/api",
         description: "Airtable is a spreadsheet-database hybrid, with the features of a database but applied to a spreadsheet.",
         friendlyName: "Airtable",
-        type: "Spreadsheet",
         datasource: {
             apiKey: {
                 type: datasource_1.DatasourceFieldTypes.PASSWORD,

package/dist/integrations/arangodb.js

@@ -16,7 +16,6 @@ var ArangoModule;
     const SCHEMA = {
         docs: "https://github.com/arangodb/arangojs",
         friendlyName: "ArangoDB",
-        type: "Non-relational",
         description: "ArangoDB is a scalable open-source multi-model database natively supporting graph, document and search. All supported data models & access patterns can be combined in queries allowing for maximal flexibility. ",
         datasource: {
             url: {

package/dist/integrations/base/sql.js

@@ -89,23 +89,6 @@ function parseFilters(filters) {
     }
     return filters;
 }
-function generateSelectStatement(json, knex) {
-    var _a;
-    const { resource, meta } = json;
-    const schema = (_a = meta === null || meta === void 0 ? void 0 : meta.table) === null || _a === void 0 ? void 0 : _a.schema;
-    return resource.fields.map(field => {
-        const fieldNames = field.split(/\./g);
-        const tableName = fieldNames[0];
-        const columnName = fieldNames[1];
-        if (columnName && knex.client.config.client === utils_1.SqlClients.POSTGRES) {
-            const externalType = schema === null || schema === void 0 ? void 0 : schema[columnName].externalType;
-            if (externalType === null || externalType === void 0 ? void 0 : externalType.includes("money")) {
-                return knex.raw(`"${tableName}"."${columnName}"::money::numeric as "${field}"`);
-            }
-        }
-        return `${field} as ${field}`;
-    });
-}
 class InternalBuilder {
     constructor(client) {
         this.client = client;
@@ -226,7 +209,7 @@ class InternalBuilder {
         }
         return query;
     }
-    addRelationships(query, fromTable, relationships) {
+    addRelationships(knex, query, fields, fromTable, relationships) {
         if (!relationships) {
             return query;
         }
@@ -328,7 +311,7 @@ class InternalBuilder {
         if (resource.fields && resource.fields.length > 0) {
             // select the resources as the format "table.columnName" - this is what is provided
             // by the resource builder further up
-            selectStatement = generateSelectStatement(json, knex);
+            selectStatement = resource.fields.map(field => `${field} as ${field}`);
         }
         let foundLimit = limit || BASE_LIMIT;
         // handle pagination
@@ -364,7 +347,7 @@ class InternalBuilder {
             preQuery = this.addSorting(preQuery, json);
         }
         // handle joins
-        query = this.addRelationships(preQuery, tableName, relationships);
+        query = this.addRelationships(knex, preQuery, selectStatement, tableName, relationships);
         return this.addFilters(query, filters, { relationship: true });
     }
     update(knex, json, opts) {

package/dist/integrations/couchdb.js

@@ -16,7 +16,6 @@ var CouchDBModule;
     const SCHEMA = {
         docs: "https://docs.couchdb.org/en/stable/",
         friendlyName: "CouchDB",
-        type: "Non-relational",
         description: "Apache CouchDB is an open-source document-oriented NoSQL database, implemented in Erlang.",
         datasource: {
             url: {

package/dist/integrations/dynamodb.js

@@ -18,7 +18,6 @@ var DynamoModule;
         docs: "https://github.com/dabit3/dynamodb-documentclient-cheat-sheet",
         description: "Amazon DynamoDB is a key-value and document database that delivers single-digit millisecond performance at any scale.",
         friendlyName: "DynamoDB",
-        type: "Non-relational",
         datasource: {
             region: {
                 type: datasource_1.DatasourceFieldTypes.STRING,

package/dist/integrations/elasticsearch.js

@@ -17,7 +17,6 @@ var ElasticsearchModule;
         docs: "https://www.elastic.co/guide/en/elasticsearch/client/javascript-api/current/index.html",
         description: "Elasticsearch is a search engine based on the Lucene library. It provides a distributed, multitenant-capable full-text search engine with an HTTP web interface and schema-free JSON documents.",
         friendlyName: "ElasticSearch",
-        type: "Non-relational",
         datasource: {
             url: {
                 type: datasource_1.DatasourceFieldTypes.STRING,

package/dist/integrations/firebase.js

@@ -16,7 +16,6 @@ var Firebase;
     const SCHEMA = {
         docs: "https://firebase.google.com/docs/firestore/quickstart",
         friendlyName: "Firestore",
-        type: "Non-relational",
         description: "Cloud Firestore is a flexible, scalable database for mobile, web, and server development from Firebase and Google Cloud.",
         datasource: {
             email: {

package/dist/integrations/googlesheets.js

@@ -33,7 +33,6 @@ var GoogleSheetsModule;
         docs: "https://developers.google.com/sheets/api/quickstart/nodejs",
         description: "Create and collaborate on online spreadsheets in real-time and from any device. ",
         friendlyName: "Google Sheets",
-        type: "Spreadsheet",
         datasource: {
             spreadsheetId: {
                 display: "Google Sheet URL",

package/dist/integrations/index.js

@@ -13,7 +13,6 @@ const rest = require("./rest");
 const googlesheets = require("./googlesheets");
 const firebase = require("./firebase");
 const redis = require("./redis");
-const snowflake = require("./snowflake");
 const { SourceNames } = require("../definitions/datasource");
 const environment = require("../environment");
 const DEFINITIONS = {
@@ -30,7 +29,6 @@ const DEFINITIONS = {
     [SourceNames.REST]: rest.schema,
     [SourceNames.FIRESTORE]: firebase.schema,
     [SourceNames.REDIS]: redis.schema,
-    [SourceNames.SNOWFLAKE]: snowflake.schema,
 };
 const INTEGRATIONS = {
     [SourceNames.POSTGRES]: postgres.integration,
@@ -47,8 +45,6 @@ const INTEGRATIONS = {
     [SourceNames.FIRESTORE]: firebase.integration,
     [SourceNames.GOOGLE_SHEETS]: googlesheets.integration,
     [SourceNames.REDIS]: redis.integration,
-    [SourceNames.FIREBASE]: firebase.integration,
-    [SourceNames.SNOWFLAKE]: snowflake.integration,
 };
 // optionally add oracle integration if the oracle binary can be installed
 if (!(process.arch === "arm64" && process.platform === "darwin")) {

package/dist/integrations/microsoftSqlServer.js

@@ -21,7 +21,6 @@ var MSSQLModule;
         plus: true,
         description: "Microsoft SQL Server is a relational database management system developed by Microsoft. ",
         friendlyName: "MS SQL Server",
-        type: "Relational",
         datasource: {
             user: {
                 type: datasource_1.DatasourceFieldTypes.STRING,
@@ -202,7 +201,7 @@ var MSSQLModule;
                         if (typeof name !== "string") {
                             continue;
                         }
-                        schema[name] = Object.assign(Object.assign({ autocolumn: !!autoColumns.find((col) => col === name), name: name }, (0, utils_1.convertSqlType)(def.DATA_TYPE)), { externalType: def.DATA_TYPE });
+                        schema[name] = Object.assign({ autocolumn: !!autoColumns.find((col) => col === name), name: name }, (0, utils_1.convertSqlType)(def.DATA_TYPE));
                     }
                     tables[tableName] = {
                         _id: (0, utils_1.buildExternalTableId)(datasourceId, tableName),

package/dist/integrations/mongodb.js

@@ -16,7 +16,6 @@ var MongoDBModule;
     const SCHEMA = {
         docs: "https://github.com/mongodb/node-mongodb-native",
         friendlyName: "MongoDB",
-        type: "Non-relational",
         description: "MongoDB is a general purpose, document-based, distributed database built for modern application developers and for the cloud era.",
         datasource: {
             connectionString: {

package/dist/integrations/mysql.js

@@ -24,7 +24,6 @@ var MySQLModule;
         docs: "https://github.com/sidorares/node-mysql2",
         plus: true,
         friendlyName: "MySQL",
-        type: "Relational",
         description: "MySQL Database Service is a fully managed database service to deploy cloud-native applications. ",
         datasource: {
             host: {
@@ -188,7 +187,7 @@ var MySQLModule;
                             const isAuto = typeof column.Extra === "string" &&
                                 (column.Extra === "auto_increment" ||
                                     column.Extra.toLowerCase().includes("generated"));
-                            schema[columnName] = Object.assign(Object.assign({ name: columnName, autocolumn: isAuto, constraints }, (0, utils_1.convertSqlType)(column.Type)), { externalType: column.Type });
+                            schema[columnName] = Object.assign({ name: columnName, autocolumn: isAuto, constraints }, (0, utils_1.convertSqlType)(column.Type));
                         }
                         if (!tables[tableName]) {
                             tables[tableName] = {

package/dist/integrations/oracle.js

@@ -24,7 +24,6 @@ var OracleModule;
         docs: "https://github.com/oracle/node-oracledb",
         plus: true,
         friendlyName: "Oracle",
-        type: "Relational",
         description: "Oracle Database is an object-relational database management system developed by Oracle Corporation",
         datasource: {
             host: {

package/dist/integrations/postgres.js

@@ -29,7 +29,6 @@ var PostgresModule;
         docs: "https://node-postgres.com",
         plus: true,
         friendlyName: "PostgreSQL",
-        type: "Relational",
         description: "PostgreSQL, also known as Postgres, is a free and open-source relational database management system emphasizing extensibility and SQL compliance.",
         datasource: {
             host: {
@@ -230,7 +229,7 @@ var PostgresModule;
                             column.column_default.startsWith("nextval");
                         const isGenerated = column.is_generated && column.is_generated !== "NEVER";
                         const isAuto = hasDefault || identity || isGenerated;
-                        tables[tableName].schema[columnName] = Object.assign(Object.assign({ autocolumn: isAuto, name: columnName }, (0, utils_1.convertSqlType)(column.data_type)), { externalType: column.data_type });
+                        tables[tableName].schema[columnName] = Object.assign({ autocolumn: isAuto, name: columnName }, (0, utils_1.convertSqlType)(column.data_type));
                     }
                     const final = (0, utils_1.finaliseExternalTables)(tables, entities);
                     this.tables = final.tables;

package/dist/integrations/redis.js

@@ -20,7 +20,6 @@ var RedisModule;
         docs: "https://redis.io/docs/",
         description: "",
         friendlyName: "Redis",
-        type: "Non-relational",
         datasource: {
             host: {
                 type: "string",

package/dist/integrations/rest.js

@@ -56,7 +56,6 @@ var RestModule;
         docs: "https://github.com/node-fetch/node-fetch",
         description: "With the REST API datasource, you can connect, query and pull data from multiple REST APIs. You can then use the retrieved data to build apps.",
         friendlyName: "REST API",
-        type: "API",
         datasource: {
             url: {
                 type: datasource_1.DatasourceFieldTypes.STRING,

package/dist/integrations/s3.js

@@ -17,7 +17,6 @@ var S3Module;
         docs: "https://docs.aws.amazon.com/AWSJavaScriptSDK/latest/AWS/S3.html",
         description: "Amazon Simple Storage Service (Amazon S3) is an object storage service that offers industry-leading scalability, data availability, security, and performance.",
         friendlyName: "Amazon S3",
-        type: "Object store",
         datasource: {
             region: {
                 type: "string",

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "1.0.212-alpha.8",
+    "version": "1.0.213",
     "description": "Budibase Web Server",
     "main": "src/index.ts",
     "repository": {
@@ -77,11 +77,10 @@
     "license": "GPL-3.0",
     "dependencies": {
         "@apidevtools/swagger-parser": "10.0.3",
-        "@budibase/backend-core": "^1.0.212-alpha.8",
-        "@budibase/client": "^1.0.212-alpha.8",
-        "@budibase/pro": "1.0.212-alpha.8",
-        "@budibase/string-templates": "^1.0.212-alpha.8",
-        "@budibase/types": "^1.0.212-alpha.8",
+        "@budibase/backend-core": "^1.0.213",
+        "@budibase/client": "^1.0.213",
+        "@budibase/pro": "1.0.213",
+        "@budibase/string-templates": "^1.0.213",
         "@bull-board/api": "3.7.0",
         "@bull-board/koa": "3.9.4",
         "@elastic/elasticsearch": "7.10.0",
@@ -136,7 +135,6 @@
         "pouchdb-replication-stream": "1.2.9",
         "redis": "4",
         "server-destroy": "1.0.1",
-        "snowflake-promise": "^4.5.0",
         "svelte": "3.44.1",
         "swagger-parser": "10.0.3",
         "to-json-schema": "0.2.5",
@@ -152,6 +150,7 @@
         "@babel/core": "7.17.4",
         "@babel/preset-env": "7.16.11",
         "@budibase/standard-components": "^0.9.139",
+        "@budibase/types": "^1.0.213",
         "@jest/test-sequencer": "24.9.0",
         "@types/apidoc": "0.50.0",
         "@types/bson": "4.2.0",

package/dist/threads/automation.js

@@ -195,7 +195,7 @@ class Orchestrator {
                                 }
                             }
                         }
-                        if (index === env.AUTOMATION_MAX_ITERATION ||
+                        if (index === parseInt(env.AUTOMATION_MAX_ITERATIONS) ||
                             index === parseInt(loopStep.inputs.iterations)) {
                             this.updateContextAndOutput(loopStepNumber, step, tempOutput, {
                                 status: AutomationErrors.MAX_ITERATIONS,