@budibase/server 1.0.58 → 1.0.62

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 18:13:12 GMT+0000 (Coordinated Universal Time)
+                at Sat Feb 12 2022 12:01:11 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 18:13:12 GMT+0000 (Coordinated Universal Time)
+                at Sat Feb 12 2022 12:01:11 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 18:13:12 GMT+0000 (Coordinated Universal Time)
+                at Sat Feb 12 2022 12:01:11 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 18:13:12 GMT+0000 (Coordinated Universal Time)
+                at Sat Feb 12 2022 12:01:11 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 18:13:12 GMT+0000 (Coordinated Universal Time)
+                at Sat Feb 12 2022 12:01:11 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 18:13:12 GMT+0000 (Coordinated Universal Time)
+                at Sat Feb 12 2022 12:01:11 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 18:13:12 GMT+0000 (Coordinated Universal Time)
+                at Sat Feb 12 2022 12:01:11 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

package/coverage/lcov.info

@@ -2186,9 +2186,9 @@ BRH:19
 end_of_record
 TN:
 SF:src/api/controllers/query/validation.js
-FN:4,(anonymous_0)
-FN:26,(anonymous_1)
-FN:31,(anonymous_2)
+FN:6,(anonymous_0)
+FN:28,(anonymous_1)
+FN:33,(anonymous_2)
 FNF:3
 FNH:3
 FNDA:28,(anonymous_0)
@@ -2197,13 +2197,14 @@ FNDA:23,(anonymous_2)
 DA:1,40
 DA:2,40
 DA:4,40
-DA:5,28
-DA:26,40
-DA:28,23
-DA:31,40
-DA:33,23
-LF:8
-LH:8
+DA:6,40
+DA:7,28
+DA:28,40
+DA:30,23
+DA:33,40
+DA:35,23
+LF:9
+LH:9
 BRF:0
 BRH:0
 end_of_record

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

@@ -1,6 +1,7 @@
 "use strict";
 const joiValidator = require("../../../middleware/joi-validator");
 const Joi = require("joi");
+const OPTIONAL_STRING = Joi.string().optional().allow(null).allow("");
 exports.queryValidation = () => {
     return Joi.object({
         _id: Joi.string(),
@@ -16,7 +17,7 @@ exports.queryValidation = () => {
         queryVerb: Joi.string().allow().required(),
         extra: Joi.object().optional(),
         schema: Joi.object({}).required().unknown(true),
-        transformer: Joi.string().optional(),
+        transformer: OPTIONAL_STRING,
         flags: Joi.object().optional(),
     });
 };
@@ -27,12 +28,18 @@ exports.generateQueryValidation = () => {
 exports.generateQueryPreviewValidation = () => {
     // prettier-ignore
     return joiValidator.body(Joi.object({
+        _id: OPTIONAL_STRING,
+        _rev: OPTIONAL_STRING,
+        readable: Joi.boolean().optional(),
         fields: Joi.object().required(),
-        queryVerb: Joi.string().allow().required(),
+        queryVerb: Joi.string().required(),
+        name: OPTIONAL_STRING,
+        flags: Joi.object().optional(),
+        schema: Joi.object().optional(),
         extra: Joi.object().optional(),
         datasourceId: Joi.string().required(),
-        transformer: Joi.string().optional(),
+        transformer: OPTIONAL_STRING,
         parameters: Joi.object({}).required().unknown(true),
-        queryId: Joi.string().optional(),
+        queryId: OPTIONAL_STRING,
     }));
 };

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/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/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "1.0.58-alpha.0",
+    "version": "1.0.61",
     "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.58-alpha.0",
-        "@budibase/client": "^1.0.58-alpha.0",
-        "@budibase/string-templates": "^1.0.58-alpha.0",
+        "@budibase/backend-core": "^1.0.61",
+        "@budibase/client": "^1.0.61",
+        "@budibase/string-templates": "^1.0.61",
         "@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/)