@budibase/server 1.0.55 → 1.0.58-alpha.1

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

@@ -289,7 +289,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">istanbul</a>
-                at Wed Feb 09 2022 17:41:02 GMT+0000 (Coordinated Universal Time)
+                at Fri Feb 11 2022 18:29:25 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

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

@@ -118,7 +118,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">istanbul</a>
-                at Wed Feb 09 2022 17:41:02 GMT+0000 (Coordinated Universal Time)
+                at Fri Feb 11 2022 18:29:25 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

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

@@ -136,7 +136,7 @@ exports.getFullUser = async (ctx, userId) => {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Wed Feb 09 2022 17:41:02 GMT+0000 (Coordinated Universal Time)
+                at Fri Feb 11 2022 18:29:25 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

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

@@ -334,7 +334,7 @@ exports.removeAppFromUserRoles = async (ctx, appId) => {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Wed Feb 09 2022 17:41:02 GMT+0000 (Coordinated Universal Time)
+                at Fri Feb 11 2022 18:29:25 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

package/coverage/lcov.info

@@ -1175,18 +1175,18 @@ end_of_record
 TN:
 SF:src/api/controllers/integration.js
 FN:3,(anonymous_0)
-FN:9,(anonymous_1)
+FN:8,(anonymous_1)
 FNF:2
 FNH:2
 FNDA:1,(anonymous_0)
 FNDA:1,(anonymous_1)
 DA:1,23
 DA:3,23
+DA:4,1
 DA:5,1
-DA:6,1
-DA:9,23
+DA:8,23
+DA:9,1
 DA:10,1
-DA:11,1
 LF:7
 LH:7
 BRF:0
@@ -2047,7 +2047,7 @@ FNDA:1,(anonymous_2)
 FNDA:0,(anonymous_3)
 FNDA:28,(anonymous_4)
 FNDA:3,(anonymous_5)
-FNDA:8,(anonymous_6)
+FNDA:7,(anonymous_6)
 FNDA:2,execute
 FNDA:2,(anonymous_8)
 FNDA:0,(anonymous_9)
@@ -2107,13 +2107,13 @@ DA:101,1
 DA:102,1
 DA:104,3
 DA:107,39
-DA:108,8
-DA:110,8
-DA:114,8
-DA:116,8
-DA:117,8
+DA:108,7
+DA:110,7
+DA:114,7
+DA:116,7
+DA:117,7
 DA:127,7
-DA:134,1
+DA:134,0
 DA:139,2
 DA:141,2
 DA:142,2
@@ -2151,7 +2151,7 @@ DA:208,2
 DA:209,2
 DA:210,2
 LF:95
-LH:76
+LH:75
 BRDA:15,0,0,39
 BRDA:15,0,1,39
 BRDA:21,1,0,2
@@ -4393,7 +4393,7 @@ SF:src/api/controllers/view/exporters.js
 FN:1,(anonymous_0)
 FN:2,(anonymous_1)
 FN:6,(anonymous_2)
-FN:16,(anonymous_3)
+FN:19,(anonymous_3)
 FNF:4
 FNH:4
 FNDA:1,(anonymous_0)
@@ -4406,15 +4406,15 @@ DA:4,1
 DA:5,1
 DA:7,2
 DA:8,2
-DA:9,2
-DA:13,1
-DA:16,38
-DA:17,1
-DA:20,38
+DA:12,2
+DA:16,1
+DA:19,38
+DA:20,1
+DA:23,38
 LF:11
 LH:11
-BRDA:8,0,0,0
-BRDA:8,0,1,2
+BRDA:9,0,0,0
+BRDA:9,0,1,2
 BRF:2
 BRH:1
 end_of_record
@@ -7738,25 +7738,25 @@ DA:10,23
 DA:11,23
 DA:13,24
 DA:14,24
-DA:15,0
+DA:15,1
 DA:16,0
-DA:18,24
+DA:18,23
 DA:22,40
 DA:23,230
 DA:26,40
 DA:27,46
 LF:17
-LH:14
+LH:15
 BRDA:4,0,0,0
 BRDA:4,0,1,24
 BRDA:8,1,0,1
 BRDA:8,1,1,23
 BRDA:10,2,0,23
 BRDA:10,2,1,0
-BRDA:14,3,0,0
-BRDA:14,3,1,24
+BRDA:14,3,0,1
+BRDA:14,3,1,23
 BRF:8
-BRH:5
+BRH:6
 end_of_record
 TN:
 SF:src/middleware/resourceId.js
@@ -8144,22 +8144,22 @@ FN:46,(anonymous_3)
 FN:54,(anonymous_4)
 FNF:5
 FNH:5
-FNDA:20,typeToFile
+FNDA:19,typeToFile
 FNDA:77,(anonymous_1)
-FNDA:20,(anonymous_2)
-FNDA:20,(anonymous_3)
-FNDA:16,(anonymous_4)
+FNDA:19,(anonymous_2)
+FNDA:19,(anonymous_3)
+FNDA:15,(anonymous_4)
 DA:1,39
 DA:2,39
 DA:4,39
-DA:10,20
-DA:11,20
-DA:13,10
-DA:14,10
+DA:10,19
+DA:11,19
+DA:13,9
+DA:14,9
 DA:16,10
 DA:17,10
 DA:19,0
-DA:21,20
+DA:21,19
 DA:26,77
 DA:27,77
 DA:28,77
@@ -8168,19 +8168,19 @@ DA:34,0
 DA:38,0
 DA:39,0
 DA:41,0
-DA:46,20
-DA:49,20
-DA:50,20
+DA:46,19
+DA:49,19
+DA:50,19
 DA:52,0
-DA:54,20
-DA:55,16
-DA:56,2
+DA:54,19
+DA:55,15
+DA:56,1
 DA:58,14
 DA:65,39
 DA:66,39
 LF:29
 LH:23
-BRDA:11,0,0,10
+BRDA:11,0,0,9
 BRDA:11,0,1,10
 BRDA:11,0,2,0
 BRDA:25,1,0,38
@@ -8194,9 +8194,9 @@ BRDA:33,4,0,0
 BRDA:33,4,1,77
 BRDA:38,5,0,0
 BRDA:38,5,1,0
-BRDA:49,6,0,20
+BRDA:49,6,0,19
 BRDA:49,6,1,0
-BRDA:55,7,0,2
+BRDA:55,7,0,1
 BRDA:55,7,1,14
 BRF:18
 BRH:10
@@ -8212,52 +8212,52 @@ FN:118,(anonymous_5)
 FN:136,(anonymous_6)
 FN:151,(anonymous_7)
 FN:160,(anonymous_8)
-FN:175,(anonymous_9)
-FN:216,(anonymous_10)
-FN:217,(anonymous_11)
-FN:220,(anonymous_12)
-FN:223,(anonymous_13)
+FN:181,(anonymous_9)
+FN:223,(anonymous_10)
+FN:224,(anonymous_11)
+FN:227,(anonymous_12)
+FN:230,(anonymous_13)
 FNF:14
 FNH:13
-FNDA:15,(anonymous_0)
-FNDA:16,(anonymous_1)
+FNDA:14,(anonymous_0)
+FNDA:15,(anonymous_1)
 FNDA:13,(anonymous_2)
 FNDA:0,(anonymous_3)
 FNDA:5,(anonymous_4)
 FNDA:6,(anonymous_5)
-FNDA:16,(anonymous_6)
+FNDA:15,(anonymous_6)
 FNDA:6,(anonymous_7)
 FNDA:6,(anonymous_8)
-FNDA:16,(anonymous_9)
-FNDA:10,(anonymous_10)
-FNDA:10,(anonymous_11)
+FNDA:15,(anonymous_9)
+FNDA:9,(anonymous_10)
+FNDA:9,(anonymous_11)
 FNDA:8,(anonymous_12)
-FNDA:2,(anonymous_13)
+FNDA:1,(anonymous_13)
 DA:1,2
 DA:2,2
 DA:3,2
 DA:4,2
 DA:5,2
 DA:6,2
-DA:10,15
-DA:11,15
-DA:12,15
-DA:13,15
-DA:14,15
-DA:15,15
-DA:16,15
-DA:17,15
-DA:18,15
-DA:22,15
-DA:23,15
-DA:27,16
-DA:29,16
-DA:30,16
-DA:33,16
+DA:10,14
+DA:11,14
+DA:12,14
+DA:13,14
+DA:14,14
+DA:15,14
+DA:16,14
+DA:17,14
+DA:18,14
+DA:22,14
+DA:23,14
+DA:27,15
+DA:29,15
+DA:30,15
+DA:33,15
 DA:34,0
-DA:37,16
-DA:38,16
-DA:39,2
+DA:37,15
+DA:38,15
+DA:39,1
 DA:41,14
 DA:43,14
 DA:44,14
@@ -8300,54 +8300,54 @@ DA:128,5
 DA:129,5
 DA:131,1
 DA:133,6
-DA:137,16
-DA:138,16
+DA:137,15
+DA:138,15
 DA:139,0
-DA:141,16
-DA:142,16
-DA:143,16
+DA:141,15
+DA:142,15
+DA:143,15
 DA:144,2
 DA:145,2
-DA:148,16
-DA:150,11
-DA:151,11
+DA:148,15
+DA:150,10
+DA:151,10
 DA:153,6
 DA:154,0
 DA:157,6
 DA:158,6
-DA:160,11
-DA:161,11
-DA:162,11
+DA:160,10
+DA:161,10
+DA:162,10
 DA:163,6
 DA:164,6
-DA:169,6
-DA:172,16
-DA:176,16
-DA:179,16
-DA:180,19
-DA:181,0
-DA:183,19
-DA:185,0
+DA:175,6
+DA:178,15
+DA:182,15
+DA:185,15
 DA:186,19
-DA:188,19
-DA:193,0
-DA:196,16
-DA:201,0
-DA:202,0
-DA:210,0
-DA:212,16
-DA:216,2
-DA:217,10
-DA:218,10
-DA:219,10
-DA:221,8
-DA:224,2
+DA:187,0
+DA:189,19
+DA:191,0
+DA:192,19
+DA:194,19
+DA:200,0
+DA:203,15
+DA:208,0
+DA:209,0
+DA:217,0
+DA:219,15
+DA:223,2
+DA:224,9
+DA:225,9
+DA:226,9
+DA:228,8
+DA:231,1
 LF:109
 LH:95
-BRDA:9,0,0,10
+BRDA:9,0,0,9
 BRDA:33,1,0,0
-BRDA:33,1,1,16
-BRDA:38,2,0,2
+BRDA:33,1,1,15
+BRDA:38,2,0,1
 BRDA:38,2,1,14
 BRDA:48,3,0,12
 BRDA:48,3,1,2
@@ -8372,34 +8372,34 @@ BRDA:123,11,1,1
 BRDA:124,12,0,0
 BRDA:124,12,1,5
 BRDA:138,13,0,0
-BRDA:138,13,1,16
-BRDA:138,14,0,16
-BRDA:138,14,1,16
-BRDA:141,15,0,16
-BRDA:141,15,1,15
-BRDA:142,16,0,16
-BRDA:142,16,1,5
+BRDA:138,13,1,15
+BRDA:138,14,0,15
+BRDA:138,14,1,15
+BRDA:141,15,0,15
+BRDA:141,15,1,14
+BRDA:142,16,0,15
+BRDA:142,16,1,4
 BRDA:144,17,0,2
 BRDA:144,17,1,0
-BRDA:148,18,0,11
+BRDA:148,18,0,10
 BRDA:148,18,1,5
 BRDA:153,19,0,0
 BRDA:153,19,1,6
-BRDA:175,20,0,0
-BRDA:180,21,0,0
-BRDA:180,21,1,19
-BRDA:183,22,0,0
-BRDA:183,22,1,19
-BRDA:186,23,0,19
-BRDA:186,23,1,0
-BRDA:196,24,0,0
-BRDA:196,24,1,16
-BRDA:197,25,0,16
-BRDA:197,25,1,16
-BRDA:197,25,2,16
-BRDA:203,26,0,0
-BRDA:203,26,1,0
-BRDA:203,26,2,0
+BRDA:181,20,0,0
+BRDA:186,21,0,0
+BRDA:186,21,1,19
+BRDA:189,22,0,0
+BRDA:189,22,1,19
+BRDA:192,23,0,19
+BRDA:192,23,1,0
+BRDA:203,24,0,0
+BRDA:203,24,1,15
+BRDA:204,25,0,15
+BRDA:204,25,1,15
+BRDA:204,25,2,15
+BRDA:210,26,0,0
+BRDA:210,26,1,0
+BRDA:210,26,2,0
 BRF:56
 BRH:39
 end_of_record

package/dist/api/controllers/integration.js

@@ -11,7 +11,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 const { definitions } = require("../../integrations");
 exports.fetch = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        // TODO: fetch these from a github repo etc
         ctx.status = 200;
         ctx.body = definitions;
     });

package/dist/api/controllers/query/validation.js

@@ -27,8 +27,14 @@ exports.generateQueryValidation = () => {
 exports.generateQueryPreviewValidation = () => {
     // prettier-ignore
     return joiValidator.body(Joi.object({
+        _id: Joi.string().optional(),
+        _rev: Joi.string().optional(),
+        readable: Joi.boolean().optional(),
         fields: Joi.object().required(),
         queryVerb: Joi.string().allow().required(),
+        name: Joi.string().required(),
+        flags: Joi.object().optional(),
+        schema: Joi.object().optional(),
         extra: Joi.object().optional(),
         datasourceId: Joi.string().required(),
         transformer: Joi.string().optional(),

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

@@ -447,6 +447,7 @@ var External;
          * all and then re-create, as theres no chance of losing data (e.g. delete succeed, but write fail).
          */
         handleManyRelationships(mainTableId, row, relationships) {
+            var _a;
             return __awaiter(this, void 0, void 0, function* () {
                 // if we're creating (in a through table) need to wipe the existing ones first
                 const promises = [];
@@ -460,7 +461,7 @@ var External;
                     if (!linkTable || !linkPrimary) {
                         return;
                     }
-                    const rows = related[key].rows || [];
+                    const rows = ((_a = related[key]) === null || _a === void 0 ? void 0 : _a.rows) || [];
                     const found = rows.find((row) => row[linkPrimary] === relationship.id ||
                         row[linkPrimary] === (body === null || body === void 0 ? void 0 : body[linkPrimary]));
                     const operation = isUpdate

package/dist/api/controllers/view/exporters.js

@@ -5,8 +5,11 @@ exports.csv = function (headers, rows) {
         csv = `${csv}\n${headers
             .map(header => {
             let val = row[header];
-            val = typeof val === "object" ? JSON.stringify(val) : val;
-            return `"${val}"`.trim();
+            val =
+                typeof val === "object"
+                    ? `"${JSON.stringify(val).replace(/"/g, "'")}"`
+                    : `"${val}"`;
+            return val.trim();
         })
             .join(",")}`;
     }

package/dist/integrations/base/sql.js

@@ -198,33 +198,33 @@ class InternalBuilder {
             const { toTable, throughTable } = JSON.parse(key);
             if (!throughTable) {
                 // @ts-ignore
-                query = query.join(toTable, function () {
+                query = query.leftJoin(toTable, function () {
                     for (let relationship of relationships) {
                         const from = relationship.from, to = relationship.to;
                         // @ts-ignore
                         this.orOn(`${fromTable}.${from}`, "=", `${toTable}.${to}`);
                     }
-                }, "left");
+                });
             }
             else {
                 query = query
                     // @ts-ignore
-                    .join(throughTable, function () {
+                    .leftJoin(throughTable, function () {
                     for (let relationship of relationships) {
                         const fromPrimary = relationship.fromPrimary;
                         const from = relationship.from;
                         // @ts-ignore
                         this.orOn(`${fromTable}.${fromPrimary}`, "=", `${throughTable}.${from}`);
                     }
-                }, "left")
-                    .join(toTable, function () {
+                })
+                    .leftJoin(toTable, function () {
                     for (let relationship of relationships) {
                         const toPrimary = relationship.toPrimary;
                         const to = relationship.to;
                         // @ts-ignore
                         this.orOn(`${toTable}.${toPrimary}`, `${throughTable}.${to}`);
                     }
-                }, "left");
+                });
             }
         }
         return query.limit(BASE_LIMIT);

package/dist/integrations/dynamodb.js

@@ -153,13 +153,11 @@ var DynamoModule;
         read(query) {
             return __awaiter(this, void 0, void 0, function* () {
                 const params = Object.assign({ TableName: query.table, IndexName: query.index ? query.index : undefined }, query.json);
-                if (query.index) {
-                    const response = yield this.client.query(params).promise();
-                    if (response.Items) {
-                        return response.Items;
-                    }
-                    return response;
+                const response = yield this.client.query(params).promise();
+                if (response.Items) {
+                    return response.Items;
                 }
+                return response;
             });
         }
         scan(query) {

package/dist/integrations/index.js

@@ -12,6 +12,7 @@ const arangodb = require("./arangodb");
 const rest = require("./rest");
 const googlesheets = require("./googlesheets");
 const { SourceNames } = require("../definitions/datasource");
+const environment = require("../environment");
 const DEFINITIONS = {
     [SourceNames.POSTGRES]: postgres.schema,
     [SourceNames.DYNAMODB]: dynamodb.schema,
@@ -24,7 +25,6 @@ const DEFINITIONS = {
     [SourceNames.MYSQL]: mysql.schema,
     [SourceNames.ARANGODB]: arangodb.schema,
     [SourceNames.REST]: rest.schema,
-    [SourceNames.GOOGLE_SHEETS]: googlesheets.schema,
 };
 const INTEGRATIONS = {
     [SourceNames.POSTGRES]: postgres.integration,
@@ -38,7 +38,6 @@ const INTEGRATIONS = {
     [SourceNames.MYSQL]: mysql.integration,
     [SourceNames.ARANGODB]: arangodb.integration,
     [SourceNames.REST]: rest.integration,
-    [SourceNames.GOOGLE_SHEETS]: googlesheets.integration,
 };
 // optionally add oracle integration if the oracle binary can be installed
 if (!(process.arch === "arm64" && process.platform === "darwin")) {
@@ -46,6 +45,10 @@ if (!(process.arch === "arm64" && process.platform === "darwin")) {
     DEFINITIONS[SourceNames.ORACLE] = oracle.schema;
     INTEGRATIONS[SourceNames.ORACLE] = oracle.integration;
 }
+if (environment.SELF_HOSTED) {
+    DEFINITIONS[SourceNames.GOOGLE_SHEETS] = googlesheets.schema;
+    INTEGRATIONS[SourceNames.GOOGLE_SHEETS] = googlesheets.integration;
+}
 module.exports = {
     definitions: DEFINITIONS,
     integrations: INTEGRATIONS,

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "1.0.54",
+    "version": "1.0.58-alpha.0",
     "description": "Budibase Web Server",
     "main": "src/index.ts",
     "repository": {
@@ -70,9 +70,9 @@
     "license": "GPL-3.0",
     "dependencies": {
         "@apidevtools/swagger-parser": "^10.0.3",
-        "@budibase/backend-core": "^1.0.54",
-        "@budibase/client": "^1.0.54",
-        "@budibase/string-templates": "^1.0.54",
+        "@budibase/backend-core": "^1.0.58-alpha.0",
+        "@budibase/client": "^1.0.58-alpha.0",
+        "@budibase/string-templates": "^1.0.58-alpha.0",
         "@bull-board/api": "^3.7.0",
         "@bull-board/koa": "^3.7.0",
         "@elastic/elasticsearch": "7.10.0",

package/dist/tests/utilities/TestConfiguration.js

@@ -363,6 +363,7 @@ class TestConfiguration {
                 parameters: {},
                 fields,
                 queryVerb: "read",
+                name: datasource.name,
             })
                 .set(config.defaultHeaders())
                 .expect("Content-Type", /json/)

package/dist/threads/query.js

@@ -157,6 +157,8 @@ class QueryRunner {
                     parameters[variable.name] = processStringSync(variable.value, {
                         data: responses[i].rows,
                         info: responses[i].extra,
+                    }, {
+                        escapeNewlines: true,
                     });
                     // make sure its known that this uses dynamic variables in case it fails
                     this.hasDynamicVariables = true;
@@ -181,6 +183,7 @@ class QueryRunner {
                 enrichedQuery[key] = processStringSync(fields[key], parameters, {
                     noEscaping: true,
                     noHelpers: true,
+                    escapeNewlines: true,
                 });
             }
             else {