@budibase/server 1.0.45 → 1.0.46

package/coverage/lcov.info

@@ -1994,12 +1994,12 @@ FN:81,(anonymous_4)
 FN:96,(anonymous_5)
 FN:107,(anonymous_6)
 FN:138,execute
-FN:166,(anonymous_8)
-FN:170,(anonymous_9)
-FN:174,(anonymous_10)
-FN:181,(anonymous_11)
-FN:187,(anonymous_12)
-FN:193,(anonymous_13)
+FN:176,(anonymous_8)
+FN:180,(anonymous_9)
+FN:184,(anonymous_10)
+FN:192,(anonymous_11)
+FN:198,(anonymous_12)
+FN:204,(anonymous_13)
 FNF:14
 FNH:12
 FNDA:5,enrichQueries
@@ -2078,35 +2078,40 @@ DA:134,1
 DA:139,2
 DA:141,2
 DA:142,2
-DA:145,2
+DA:144,2
 DA:146,2
-DA:156,1
-DA:157,1
-DA:159,0
-DA:162,1
-DA:166,34
-DA:167,2
-DA:170,34
-DA:171,0
-DA:174,34
-DA:175,2
-DA:176,2
+DA:147,2
+DA:148,0
+DA:149,0
+DA:155,2
+DA:156,2
+DA:166,1
+DA:167,1
+DA:169,0
+DA:172,1
+DA:176,34
 DA:177,2
-DA:179,2
-DA:181,1
-DA:182,1
-DA:183,1
-DA:186,1
-DA:187,1
-DA:189,1
-DA:193,34
-DA:194,2
-DA:195,2
-DA:196,2
-DA:197,2
-DA:198,2
-LF:89
-LH:72
+DA:180,34
+DA:181,0
+DA:184,34
+DA:185,2
+DA:186,2
+DA:187,2
+DA:189,2
+DA:191,1
+DA:192,1
+DA:194,1
+DA:197,1
+DA:198,1
+DA:200,1
+DA:204,34
+DA:205,2
+DA:206,2
+DA:207,2
+DA:208,2
+DA:209,2
+LF:94
+LH:75
 BRDA:15,0,0,34
 BRDA:15,0,1,34
 BRDA:21,1,0,2
@@ -2122,14 +2127,22 @@ BRDA:85,5,1,0
 BRDA:100,6,0,1
 BRDA:100,6,1,2
 BRDA:138,7,0,0
-BRDA:156,8,0,1
-BRDA:156,8,1,0
-BRDA:156,9,0,1
-BRDA:156,9,1,1
-BRDA:179,10,0,1
-BRDA:179,10,1,1
-BRF:21
-BRH:15
+BRDA:144,8,0,2
+BRDA:144,8,1,0
+BRDA:146,9,0,2
+BRDA:146,9,1,0
+BRDA:146,10,0,2
+BRDA:146,10,1,2
+BRDA:148,11,0,0
+BRDA:148,11,1,0
+BRDA:166,12,0,1
+BRDA:166,12,1,0
+BRDA:166,13,0,1
+BRDA:166,13,1,1
+BRDA:189,14,0,1
+BRDA:189,14,1,1
+BRF:29
+BRH:19
 end_of_record
 TN:
 SF:src/api/controllers/query/validation.js
@@ -3133,7 +3146,7 @@ FN:15,(anonymous_1)
 FN:20,(anonymous_2)
 FN:27,(anonymous_3)
 FN:45,(anonymous_4)
-FN:65,(anonymous_5)
+FN:67,(anonymous_5)
 FNF:6
 FNH:4
 FNDA:2,(anonymous_0)
@@ -3176,21 +3189,25 @@ DA:51,74
 DA:52,206
 DA:53,206
 DA:55,206
-DA:59,0
-DA:64,206
-DA:65,0
+DA:56,0
+DA:61,206
+DA:63,0
 DA:66,0
 DA:67,0
-DA:70,206
-DA:72,0
-DA:73,0
+DA:68,0
+DA:69,0
 DA:75,0
-DA:77,206
-DA:78,0
-DA:83,206
+DA:76,0
+DA:78,206
+DA:80,0
+DA:81,0
+DA:83,0
 DA:85,206
-DA:87,74
-LF:48
+DA:86,0
+DA:91,206
+DA:93,206
+DA:95,74
+LF:52
 LH:35
 BRDA:30,0,0,0
 BRDA:30,0,1,19
@@ -3200,26 +3217,30 @@ BRDA:46,2,0,2
 BRDA:46,2,1,72
 BRDA:55,3,0,0
 BRDA:55,3,1,206
-BRDA:56,4,0,206
-BRDA:56,4,1,206
-BRDA:56,4,2,0
-BRDA:64,5,0,0
-BRDA:64,5,1,206
-BRDA:64,6,0,206
-BRDA:64,6,1,0
-BRDA:64,6,2,0
+BRDA:55,4,0,206
+BRDA:55,4,1,0
+BRDA:61,5,0,0
+BRDA:61,5,1,206
+BRDA:63,6,0,0
+BRDA:63,6,1,0
 BRDA:66,7,0,0
 BRDA:66,7,1,0
-BRDA:70,8,0,0
-BRDA:70,8,1,206
-BRDA:70,9,0,206
-BRDA:70,9,1,0
-BRDA:77,10,0,0
-BRDA:77,10,1,206
-BRDA:85,11,0,2
-BRDA:85,11,1,204
-BRF:26
-BRH:14
+BRDA:68,8,0,0
+BRDA:68,8,1,0
+BRDA:75,9,0,0
+BRDA:75,9,1,0
+BRDA:75,10,0,0
+BRDA:75,10,1,0
+BRDA:78,11,0,0
+BRDA:78,11,1,206
+BRDA:78,12,0,206
+BRDA:78,12,1,0
+BRDA:85,13,0,0
+BRDA:85,13,1,206
+BRDA:93,14,0,2
+BRDA:93,14,1,204
+BRF:30
+BRH:12
 end_of_record
 TN:
 SF:src/api/controllers/table/external.js

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

@@ -130,6 +130,15 @@ function execute(ctx, opts = { rowsOnly: false }) {
         const db = new CouchDB(ctx.appId);
         const query = yield db.get(ctx.params.queryId);
         const datasource = yield db.get(query.datasourceId);
+        const enrichedParameters = ctx.request.body.parameters || {};
+        // make sure parameters are fully enriched with defaults
+        if (query && query.parameters) {
+            for (let parameter of query.parameters) {
+                if (!enrichedParameters[parameter.name]) {
+                    enrichedParameters[parameter.name] = parameter.default;
+                }
+            }
+        }
         // call the relevant CRUD method on the integration class
         try {
             const { rows, pagination, extra } = yield Runner.run({
@@ -138,7 +147,7 @@ function execute(ctx, opts = { rowsOnly: false }) {
                 queryVerb: query.queryVerb,
                 fields: query.fields,
                 pagination: ctx.request.body.pagination,
-                parameters: ctx.request.body.parameters,
+                parameters: enrichedParameters,
                 transformer: query.transformer,
                 queryId: ctx.params.queryId,
             });
@@ -170,8 +179,7 @@ const removeDynamicVariables = (db, queryId) => __awaiter(void 0, void 0, void 0
     const dynamicVariables = datasource.config.dynamicVariables;
     if (dynamicVariables) {
         // delete dynamic variables from the datasource
-        const newVariables = dynamicVariables.filter(dv => dv.queryId !== queryId);
-        datasource.config.dynamicVariables = newVariables;
+        datasource.config.dynamicVariables = dynamicVariables.filter(dv => dv.queryId !== queryId);
         yield db.put(datasource);
         // invalidate the deleted variables
         const variablesToDelete = dynamicVariables.filter(dv => dv.queryId === queryId);

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

@@ -59,18 +59,25 @@ exports.validate = ({ appId, tableId, row, table }) => __awaiter(void 0, void 0,
         const constraints = cloneDeep(table.schema[fieldName].constraints);
         const type = table.schema[fieldName].type;
         // special case for options, need to always allow unselected (null)
-        if ((type === FieldTypes.OPTIONS || type === FieldTypes.ARRAY) &&
-            constraints.inclusion) {
+        if (type === FieldTypes.OPTIONS && constraints.inclusion) {
             constraints.inclusion.push(null);
         }
         let res;
         // Validate.js doesn't seem to handle array
-        if (type === FieldTypes.ARRAY && row[fieldName] && row[fieldName].length) {
-            row[fieldName].map(val => {
-                if (!constraints.inclusion.includes(val)) {
-                    errors[fieldName] = "Field not in list";
-                }
-            });
+        if (type === FieldTypes.ARRAY) {
+            const hasValues = Array.isArray(row[fieldName]) && row[fieldName].length > 0;
+            // Check values are valid if values are specified
+            if (hasValues) {
+                row[fieldName].map(val => {
+                    if (!constraints.inclusion.includes(val)) {
+                        errors[fieldName] = "Value not in list";
+                    }
+                });
+            }
+            // Check for required constraint
+            if (constraints.presence === true && !hasValues) {
+                errors[fieldName] = "Required field";
+            }
         }
         else if (type === FieldTypes.JSON && typeof row[fieldName] === "string") {
             // this should only happen if there is an error

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "1.0.44",
+    "version": "1.0.45",
     "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.44",
-        "@budibase/client": "^1.0.44",
-        "@budibase/string-templates": "^1.0.44",
+        "@budibase/backend-core": "^1.0.45",
+        "@budibase/client": "^1.0.45",
+        "@budibase/string-templates": "^1.0.45",
         "@bull-board/api": "^3.7.0",
         "@bull-board/koa": "^3.7.0",
         "@elastic/elasticsearch": "7.10.0",