@budibase/server 1.0.207-alpha.4 → 1.0.207-alpha.7

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 16:34:01 GMT+0000 (Coordinated Universal Time)
+                at Thu Jun 23 2022 12:18:45 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 16:34:01 GMT+0000 (Coordinated Universal Time)
+                at Thu Jun 23 2022 12:18:45 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 16:34:01 GMT+0000 (Coordinated Universal Time)
+                at Thu Jun 23 2022 12:18:45 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 16:34:01 GMT+0000 (Coordinated Universal Time)
+                at Thu Jun 23 2022 12:18:45 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 16:34:01 GMT+0000 (Coordinated Universal Time)
+                at Thu Jun 23 2022 12:18:45 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 16:34:01 GMT+0000 (Coordinated Universal Time)
+                at Thu Jun 23 2022 12:18:45 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/microsoftSqlServer.js

@@ -201,7 +201,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/mysql.js

@@ -187,7 +187,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/postgres.js

@@ -229,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({ 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/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "1.0.207-alpha.3",
+    "version": "1.0.207-alpha.6",
     "description": "Budibase Web Server",
     "main": "src/index.ts",
     "repository": {
@@ -77,11 +77,11 @@
     "license": "GPL-3.0",
     "dependencies": {
         "@apidevtools/swagger-parser": "10.0.3",
-        "@budibase/types": "^1.0.207-alpha.3",
-        "@budibase/backend-core": "^1.0.207-alpha.3",
-        "@budibase/client": "^1.0.207-alpha.3",
-        "@budibase/pro": "1.0.207-alpha.3",
-        "@budibase/string-templates": "^1.0.207-alpha.3",
+        "@budibase/backend-core": "^1.0.207-alpha.6",
+        "@budibase/client": "^1.0.207-alpha.6",
+        "@budibase/pro": "1.0.207-alpha.6",
+        "@budibase/string-templates": "^1.0.207-alpha.6",
+        "@budibase/types": "^1.0.207-alpha.6",
         "@bull-board/api": "3.7.0",
         "@bull-board/koa": "3.9.4",
         "@elastic/elasticsearch": "7.10.0",