@budibase/server 1.0.56 → 1.0.59

package/coverage/lcov-report/utilities/rowProcessor/utils.js.html

@@ -181,7 +181,7 @@ exports.processFormulas = (
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Thu Feb 10 2022 09:35:40 GMT+0000 (Coordinated Universal Time)
+                at Fri Feb 11 2022 18:25:20 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

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

@@ -136,7 +136,7 @@ module.exports = ScriptRunner
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Thu Feb 10 2022 09:35:40 GMT+0000 (Coordinated Universal Time)
+                at Fri Feb 11 2022 18:25:20 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

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

@@ -274,7 +274,7 @@ exports.CURRENTLY_SUPPORTED_LEVELS = CURRENTLY_SUPPORTED_LEVELS
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Thu Feb 10 2022 09:35:40 GMT+0000 (Coordinated Universal Time)
+                at Fri Feb 11 2022 18:25:20 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

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

@@ -85,7 +85,7 @@
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Thu Feb 10 2022 09:35:40 GMT+0000 (Coordinated Universal Time)
+                at Fri Feb 11 2022 18:25:20 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

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

@@ -125,7 +125,7 @@
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Thu Feb 10 2022 09:35:40 GMT+0000 (Coordinated Universal Time)
+                at Fri Feb 11 2022 18:25:20 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

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

@@ -343,7 +343,7 @@ exports.update = async (property, usage, opts = { dryRun: false }) => {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Thu Feb 10 2022 09:35:40 GMT+0000 (Coordinated Universal Time)
+                at Fri Feb 11 2022 18:25:20 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

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 Thu Feb 10 2022 09:35:40 GMT+0000 (Coordinated Universal Time)
+                at Fri Feb 11 2022 18:25:20 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 Thu Feb 10 2022 09:35:40 GMT+0000 (Coordinated Universal Time)
+                at Fri Feb 11 2022 18:25:20 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 Thu Feb 10 2022 09:35:40 GMT+0000 (Coordinated Universal Time)
+                at Fri Feb 11 2022 18:25:20 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 Thu Feb 10 2022 09:35:40 GMT+0000 (Coordinated Universal Time)
+                at Fri Feb 11 2022 18:25:20 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
@@ -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
@@ -8212,11 +8212,11 @@ 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)
@@ -8320,28 +8320,28 @@ DA:161,11
 DA:162,11
 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,16
+DA:182,16
+DA:185,16
 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,16
+DA:208,0
+DA:209,0
+DA:217,0
+DA:219,16
+DA:223,2
+DA:224,10
+DA:225,10
+DA:226,10
+DA:228,8
+DA:231,2
 LF:109
 LH:95
 BRDA:9,0,0,10
@@ -8385,21 +8385,21 @@ BRDA:148,18,0,11
 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,16
+BRDA:204,25,0,16
+BRDA:204,25,1,16
+BRDA:204,25,2,16
+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/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.55",
+    "version": "1.0.58",
     "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.55",
-        "@budibase/client": "^1.0.55",
-        "@budibase/string-templates": "^1.0.55",
+        "@budibase/backend-core": "^1.0.58",
+        "@budibase/client": "^1.0.58",
+        "@budibase/string-templates": "^1.0.58",
         "@bull-board/api": "^3.7.0",
         "@bull-board/koa": "^3.7.0",
         "@elastic/elasticsearch": "7.10.0",

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 {