@budibase/server 1.0.207-alpha.1 → 1.0.207-alpha.10

package/coverage/lcov-report/utilities/statusCodes.js.html

@@ -91,7 +91,7 @@
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Mon Jun 20 2022 11:45:45 GMT+0000 (Coordinated Universal Time)
+                at Thu Jun 23 2022 14:44:43 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/usageQuota/index.html

@@ -116,7 +116,7 @@
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Mon Jun 20 2022 11:45:45 GMT+0000 (Coordinated Universal Time)
+                at Thu Jun 23 2022 14:44:43 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/usageQuota/rows.js.html

@@ -307,7 +307,7 @@ exports.getUniqueRows = async appIds => {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Mon Jun 20 2022 11:45:45 GMT+0000 (Coordinated Universal Time)
+                at Thu Jun 23 2022 14:44:43 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/usageQuota/usageQuoteReset.js.html

@@ -124,7 +124,7 @@ function <span class="fstat-no" title="function not covered" >resetQuotasIfRequi
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Mon Jun 20 2022 11:45:45 GMT+0000 (Coordinated Universal Time)
+                at Thu Jun 23 2022 14:44:43 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/users.js.html

@@ -205,7 +205,7 @@ exports.publicApiUserFix = ctx => {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Mon Jun 20 2022 11:45:45 GMT+0000 (Coordinated Universal Time)
+                at Thu Jun 23 2022 14:44:43 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../prettify.js"></script>
         <script>

package/coverage/lcov-report/utilities/workerRequests.js.html

@@ -487,7 +487,7 @@ exports.readGlobalUser = <span class="fstat-no" title="function not covered" >as
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Mon Jun 20 2022 11:45:45 GMT+0000 (Coordinated Universal Time)
+                at Thu Jun 23 2022 14:44:43 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../prettify.js"></script>
         <script>

package/coverage/lcov.info

@@ -1774,9 +1774,9 @@ FN:98,(anonymous_8)
 FN:101,(anonymous_9)
 FN:152,(anonymous_10)
 FN:157,(anonymous_11)
-FN:168,(anonymous_12)
-FN:183,(anonymous_13)
-FN:213,(anonymous_14)
+FN:169,(anonymous_12)
+FN:198,(anonymous_13)
+FN:228,(anonymous_14)
 FNF:15
 FNH:0
 FNDA:0,handleRequest
@@ -1873,36 +1873,44 @@ DA:160,0
 DA:161,0
 DA:162,0
 DA:163,0
-DA:165,0
-DA:168,0
-DA:173,0
+DA:164,0
+DA:166,0
+DA:169,0
 DA:174,0
 DA:175,0
-DA:176,0
+DA:178,0
 DA:179,0
 DA:180,0
-DA:183,44
-DA:184,0
-DA:185,0
+DA:181,0
+DA:182,0
 DA:186,0
-DA:187,0
-DA:188,0
 DA:189,0
 DA:190,0
-DA:192,0
-DA:193,0
-DA:197,0
-DA:198,0
+DA:191,0
+DA:194,0
+DA:195,0
+DA:198,44
+DA:199,0
+DA:200,0
 DA:201,0
 DA:202,0
+DA:203,0
+DA:204,0
+DA:205,0
 DA:207,0
-DA:209,0
-DA:210,0
-DA:211,0
+DA:208,0
+DA:212,0
 DA:213,0
-DA:214,0
-DA:227,0
-LF:108
+DA:216,0
+DA:217,0
+DA:222,0
+DA:224,0
+DA:225,0
+DA:226,0
+DA:228,0
+DA:229,0
+DA:242,0
+LF:116
 LH:18
 BRDA:16,0,0,0
 BRDA:18,1,0,0
@@ -1937,20 +1945,24 @@ BRDA:137,15,0,0
 BRDA:137,15,1,0
 BRDA:137,16,0,0
 BRDA:137,16,1,0
-BRDA:162,17,0,0
-BRDA:162,17,1,0
-BRDA:162,18,0,0
-BRDA:162,18,1,0
-BRDA:189,19,0,0
-BRDA:189,19,1,0
-BRDA:189,20,0,0
-BRDA:189,20,1,0
-BRDA:202,21,0,0
-BRDA:202,21,1,0
-BRDA:203,22,0,0
-BRDA:203,22,1,0
-BRDA:203,22,2,0
-BRF:46
+BRDA:163,17,0,0
+BRDA:163,17,1,0
+BRDA:163,18,0,0
+BRDA:163,18,1,0
+BRDA:178,19,0,0
+BRDA:178,19,1,0
+BRDA:178,20,0,0
+BRDA:178,20,1,0
+BRDA:204,21,0,0
+BRDA:204,21,1,0
+BRDA:204,22,0,0
+BRDA:204,22,1,0
+BRDA:217,23,0,0
+BRDA:217,23,1,0
+BRDA:218,24,0,0
+BRDA:218,24,1,0
+BRDA:218,24,2,0
+BRF:50
 BRH:0
 end_of_record
 TN:

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

@@ -157,7 +157,8 @@ exports.validate = () => __awaiter(void 0, void 0, void 0, function* () {
 exports.exportRows = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     const { datasourceId } = breakExternalTableId(ctx.params.tableId);
     const db = getAppDB();
-    let format = ctx.query.format;
+    const format = ctx.query.format;
+    const { columns } = ctx.request.body;
     const datasource = yield db.get(datasourceId);
     if (!datasource || !datasource.entities) {
         ctx.throw(400, "Datasource has not been configured for plus API.");
@@ -170,12 +171,25 @@ exports.exportRows = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
         },
     };
     let result = yield exports.search(ctx);
-    let headers = Object.keys(result.rows[0]);
+    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]);
     const exporter = exporters[format];
     const filename = `export.${format}`;
     // send down the file
     ctx.attachment(filename);
-    return apiFileReturn(exporter(headers, result.rows));
+    return apiFileReturn(exporter(headers, rows));
 });
 exports.fetchEnrichedRow = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     const id = ctx.params.rowId;

package/dist/integrations/airtable.js

@@ -17,6 +17,7 @@ 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,6 +16,7 @@ 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,6 +89,23 @@ 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;
@@ -209,7 +226,7 @@ class InternalBuilder {
         }
         return query;
     }
-    addRelationships(knex, query, fields, fromTable, relationships) {
+    addRelationships(query, fromTable, relationships) {
         if (!relationships) {
             return query;
         }
@@ -311,7 +328,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 = resource.fields.map(field => `${field} as ${field}`);
+            selectStatement = generateSelectStatement(json, knex);
         }
         let foundLimit = limit || BASE_LIMIT;
         // handle pagination
@@ -347,7 +364,7 @@ class InternalBuilder {
             preQuery = this.addSorting(preQuery, json);
         }
         // handle joins
-        query = this.addRelationships(knex, preQuery, selectStatement, tableName, relationships);
+        query = this.addRelationships(preQuery, tableName, relationships);
         return this.addFilters(query, filters, { relationship: true });
     }
     update(knex, json, opts) {

package/dist/integrations/couchdb.js

@@ -16,6 +16,7 @@ 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,6 +18,7 @@ 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,6 +17,7 @@ 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,6 +16,7 @@ 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,6 +33,7 @@ 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/microsoftSqlServer.js

@@ -21,6 +21,7 @@ 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,
@@ -201,7 +202,7 @@ var MSSQLModule;
                         if (typeof name !== "string") {
                             continue;
                         }
-                        schema[name] = Object.assign({ autocolumn: !!autoColumns.find((col) => col === name), name: name }, (0, utils_1.convertSqlType)(def.DATA_TYPE));
+                        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 });
                     }
                     tables[tableName] = {
                         _id: (0, utils_1.buildExternalTableId)(datasourceId, tableName),

package/dist/integrations/mongodb.js

@@ -16,6 +16,7 @@ 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,6 +24,7 @@ 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: {
@@ -187,7 +188,7 @@ var MySQLModule;
                             const isAuto = typeof column.Extra === "string" &&
                                 (column.Extra === "auto_increment" ||
                                     column.Extra.toLowerCase().includes("generated"));
-                            schema[columnName] = Object.assign({ name: columnName, autocolumn: isAuto, constraints }, (0, utils_1.convertSqlType)(column.Type));
+                            schema[columnName] = Object.assign(Object.assign({ name: columnName, autocolumn: isAuto, constraints }, (0, utils_1.convertSqlType)(column.Type)), { externalType: column.Type });
                         }
                         if (!tables[tableName]) {
                             tables[tableName] = {

package/dist/integrations/oracle.js

@@ -24,6 +24,7 @@ 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,6 +29,7 @@ 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: {
@@ -229,7 +230,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({ autocolumn: isAuto, name: columnName }, (0, utils_1.convertSqlType)(column.data_type));
+                        tables[tableName].schema[columnName] = Object.assign(Object.assign({ autocolumn: isAuto, name: columnName }, (0, utils_1.convertSqlType)(column.data_type)), { externalType: column.data_type });
                     }
                     const final = (0, utils_1.finaliseExternalTables)(tables, entities);
                     this.tables = final.tables;

package/dist/integrations/redis.js

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

package/dist/integrations/rest.js

@@ -56,6 +56,7 @@ 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,6 +17,7 @@ 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/integrations/snowflake.js

@@ -17,6 +17,7 @@ var SnowflakeModule;
         docs: "https://developers.snowflake.com/",
         description: "Snowflake is a solution for data warehousing, data lakes, data engineering, data science, data application development, and securely sharing and consuming shared data.",
         friendlyName: "Snowflake",
+        type: "Relational",
         datasource: {
             account: {
                 type: "string",

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "1.0.207-alpha.0",
+    "version": "1.0.207-alpha.9",
     "description": "Budibase Web Server",
     "main": "src/index.ts",
     "repository": {
@@ -77,10 +77,11 @@
     "license": "GPL-3.0",
     "dependencies": {
         "@apidevtools/swagger-parser": "10.0.3",
-        "@budibase/backend-core": "^1.0.207-alpha.0",
-        "@budibase/client": "^1.0.207-alpha.0",
-        "@budibase/pro": "1.0.207-alpha.0",
-        "@budibase/string-templates": "^1.0.207-alpha.0",
+        "@budibase/backend-core": "^1.0.207-alpha.9",
+        "@budibase/client": "^1.0.207-alpha.9",
+        "@budibase/pro": "1.0.207-alpha.9",
+        "@budibase/string-templates": "^1.0.207-alpha.9",
+        "@budibase/types": "^1.0.207-alpha.9",
         "@bull-board/api": "3.7.0",
         "@bull-board/koa": "3.9.4",
         "@elastic/elasticsearch": "7.10.0",
@@ -151,7 +152,7 @@
         "@babel/core": "7.17.4",
         "@babel/preset-env": "7.16.11",
         "@budibase/standard-components": "^0.9.139",
-        "@budibase/types": "^1.0.207-alpha.0",
+        "@budibase/types": "^1.0.207-alpha.3",
         "@jest/test-sequencer": "24.9.0",
         "@types/apidoc": "0.50.0",
         "@types/bson": "4.2.0",