@budibase/server 1.0.93 → 1.0.94

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 Mon Mar 21 2022 17:15:38 GMT+0000 (Coordinated Universal Time)
+                at Tue Mar 22 2022 13:08:21 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 Mon Mar 21 2022 17:15:38 GMT+0000 (Coordinated Universal Time)
+                at Tue Mar 22 2022 13:08:21 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 Mon Mar 21 2022 17:15:38 GMT+0000 (Coordinated Universal Time)
+                at Tue Mar 22 2022 13:08:21 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 Mon Mar 21 2022 17:15:38 GMT+0000 (Coordinated Universal Time)
+                at Tue Mar 22 2022 13:08:21 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 Mon Mar 21 2022 17:15:38 GMT+0000 (Coordinated Universal Time)
+                at Tue Mar 22 2022 13:08:21 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 Mon Mar 21 2022 17:15:38 GMT+0000 (Coordinated Universal Time)
+                at Tue Mar 22 2022 13:08:21 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 Mon Mar 21 2022 17:15:38 GMT+0000 (Coordinated Universal Time)
+                at Tue Mar 22 2022 13:08:21 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

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

@@ -481,7 +481,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">istanbul</a>
-                at Mon Mar 21 2022 17:15:38 GMT+0000 (Coordinated Universal Time)
+                at Tue Mar 22 2022 13:08:21 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

package/coverage/lcov.info

@@ -8339,36 +8339,38 @@ TN:
 SF:src/threads/query.js
 FN:13,(anonymous_0)
 FN:30,(anonymous_1)
-FN:61,(anonymous_2)
-FN:129,(anonymous_3)
-FN:130,(anonymous_4)
-FN:143,(anonymous_5)
-FN:159,(anonymous_6)
-FN:177,(anonymous_7)
-FN:192,(anonymous_8)
-FN:201,(anonymous_9)
-FN:222,(anonymous_10)
-FN:264,(anonymous_11)
-FN:265,(anonymous_12)
-FN:268,(anonymous_13)
-FN:271,(anonymous_14)
-FNF:15
+FN:69,(anonymous_2)
+FN:93,(anonymous_3)
+FN:161,(anonymous_4)
+FN:162,(anonymous_5)
+FN:175,(anonymous_6)
+FN:191,(anonymous_7)
+FN:209,(anonymous_8)
+FN:224,(anonymous_9)
+FN:233,(anonymous_10)
+FN:254,(anonymous_11)
+FN:296,(anonymous_12)
+FN:297,(anonymous_13)
+FN:300,(anonymous_14)
+FN:303,(anonymous_15)
+FNF:16
 FNH:14
 FNDA:15,(anonymous_0)
 FNDA:2,(anonymous_1)
-FNDA:16,(anonymous_2)
-FNDA:13,(anonymous_3)
-FNDA:0,(anonymous_4)
-FNDA:5,(anonymous_5)
-FNDA:6,(anonymous_6)
-FNDA:14,(anonymous_7)
-FNDA:6,(anonymous_8)
+FNDA:0,(anonymous_2)
+FNDA:16,(anonymous_3)
+FNDA:13,(anonymous_4)
+FNDA:0,(anonymous_5)
+FNDA:5,(anonymous_6)
+FNDA:6,(anonymous_7)
+FNDA:14,(anonymous_8)
 FNDA:6,(anonymous_9)
-FNDA:12,(anonymous_10)
-FNDA:10,(anonymous_11)
+FNDA:6,(anonymous_10)
+FNDA:12,(anonymous_11)
 FNDA:10,(anonymous_12)
-FNDA:8,(anonymous_13)
-FNDA:2,(anonymous_14)
+FNDA:10,(anonymous_13)
+FNDA:8,(anonymous_14)
+FNDA:2,(anonymous_15)
 DA:1,2
 DA:2,2
 DA:3,2
@@ -8394,179 +8396,196 @@ DA:35,0
 DA:36,0
 DA:37,0
 DA:38,0
-DA:39,0
+DA:40,0
 DA:41,0
-DA:42,0
 DA:43,0
 DA:44,0
 DA:45,0
 DA:46,0
 DA:47,0
-DA:52,0
-DA:56,0
-DA:57,0
-DA:58,0
-DA:62,16
-DA:63,16
-DA:64,16
-DA:65,2
-DA:67,14
-DA:70,14
-DA:73,14
-DA:74,2
-DA:76,12
-DA:80,14
+DA:48,0
+DA:49,0
+DA:59,0
+DA:60,0
+DA:62,0
+DA:66,0
+DA:69,0
+DA:73,0
+DA:75,0
+DA:78,0
+DA:79,0
 DA:81,0
-DA:84,14
-DA:85,14
-DA:86,14
-DA:87,14
-DA:88,14
-DA:89,14
-DA:90,12
-DA:91,12
-DA:92,12
-DA:93,12
-DA:97,14
-DA:98,0
-DA:102,0
-DA:106,14
-DA:112,1
-DA:114,1
-DA:115,1
-DA:119,13
-DA:120,0
-DA:124,13
-DA:125,11
-DA:129,13
+DA:82,0
+DA:83,0
+DA:84,0
+DA:86,0
+DA:89,0
+DA:90,0
+DA:94,16
+DA:95,16
+DA:96,16
+DA:97,2
+DA:99,14
+DA:102,14
+DA:105,14
+DA:106,2
+DA:108,12
+DA:112,14
+DA:113,0
+DA:116,14
+DA:117,14
+DA:118,14
+DA:119,14
+DA:120,14
+DA:121,14
+DA:122,12
+DA:123,12
+DA:124,12
+DA:125,12
+DA:129,14
 DA:130,0
-DA:134,13
-DA:136,13
-DA:137,0
-DA:140,13
-DA:144,5
-DA:145,5
-DA:146,5
-DA:147,5
-DA:160,6
-DA:161,6
-DA:162,6
-DA:163,6
-DA:164,6
-DA:165,5
-DA:169,5
-DA:170,5
-DA:172,1
-DA:174,6
-DA:178,14
-DA:179,14
-DA:180,0
-DA:182,14
-DA:183,14
-DA:184,14
-DA:185,2
-DA:186,2
-DA:189,14
-DA:191,9
-DA:192,9
+DA:134,0
+DA:138,14
+DA:144,1
+DA:146,1
+DA:147,1
+DA:151,13
+DA:152,0
+DA:156,13
+DA:157,11
+DA:161,13
+DA:162,0
+DA:166,13
+DA:168,13
+DA:169,0
+DA:172,13
+DA:176,5
+DA:177,5
+DA:178,5
+DA:179,5
+DA:192,6
+DA:193,6
 DA:194,6
-DA:195,0
-DA:198,6
-DA:199,6
-DA:201,9
-DA:202,9
-DA:203,9
-DA:204,6
-DA:205,6
-DA:216,6
-DA:219,14
-DA:223,12
-DA:226,12
-DA:227,19
-DA:228,0
-DA:230,19
-DA:232,0
-DA:233,19
-DA:235,19
-DA:241,0
-DA:244,12
-DA:249,0
-DA:250,0
-DA:258,0
-DA:260,12
-DA:264,2
-DA:265,10
-DA:266,10
-DA:267,10
-DA:269,8
-DA:272,2
-LF:131
+DA:195,6
+DA:196,6
+DA:197,5
+DA:201,5
+DA:202,5
+DA:204,1
+DA:206,6
+DA:210,14
+DA:211,14
+DA:212,0
+DA:214,14
+DA:215,14
+DA:216,14
+DA:217,2
+DA:218,2
+DA:221,14
+DA:223,9
+DA:224,9
+DA:226,6
+DA:227,0
+DA:230,6
+DA:231,6
+DA:233,9
+DA:234,9
+DA:235,9
+DA:236,6
+DA:237,6
+DA:248,6
+DA:251,14
+DA:255,12
+DA:258,12
+DA:259,19
+DA:260,0
+DA:262,19
+DA:264,0
+DA:265,19
+DA:267,19
+DA:273,0
+DA:276,12
+DA:281,0
+DA:282,0
+DA:290,0
+DA:292,12
+DA:296,2
+DA:297,10
+DA:298,10
+DA:299,10
+DA:301,8
+DA:304,2
+LF:144
 LH:101
 BRDA:13,0,0,10
 BRDA:32,1,0,2
 BRDA:32,1,1,0
-BRDA:43,2,0,0
-BRDA:43,2,1,0
-BRDA:64,3,0,2
-BRDA:64,3,1,14
-BRDA:73,4,0,2
-BRDA:73,4,1,12
-BRDA:80,5,0,0
-BRDA:80,5,1,14
-BRDA:89,6,0,12
-BRDA:89,6,1,2
-BRDA:97,7,0,0
-BRDA:97,7,1,14
-BRDA:106,8,0,1
-BRDA:106,8,1,13
-BRDA:107,9,0,14
-BRDA:107,9,1,12
-BRDA:107,9,2,1
-BRDA:107,9,3,1
-BRDA:119,10,0,0
-BRDA:119,10,1,13
-BRDA:124,11,0,11
-BRDA:124,11,1,2
-BRDA:129,12,0,0
-BRDA:129,12,1,13
-BRDA:136,13,0,0
-BRDA:136,13,1,13
-BRDA:164,14,0,5
-BRDA:164,14,1,1
-BRDA:165,15,0,0
-BRDA:165,15,1,5
-BRDA:179,16,0,0
-BRDA:179,16,1,14
-BRDA:179,17,0,14
-BRDA:179,17,1,14
-BRDA:182,18,0,14
-BRDA:182,18,1,13
-BRDA:183,19,0,14
-BRDA:183,19,1,3
-BRDA:185,20,0,2
-BRDA:185,20,1,0
-BRDA:189,21,0,9
-BRDA:189,21,1,5
-BRDA:194,22,0,0
-BRDA:194,22,1,6
-BRDA:222,23,0,0
-BRDA:223,24,0,0
-BRDA:223,24,1,12
-BRDA:227,25,0,0
-BRDA:227,25,1,19
-BRDA:230,26,0,0
-BRDA:230,26,1,19
-BRDA:233,27,0,19
-BRDA:233,27,1,0
-BRDA:244,28,0,0
-BRDA:244,28,1,12
-BRDA:245,29,0,12
-BRDA:245,29,1,12
-BRDA:245,29,2,12
-BRDA:251,30,0,0
-BRDA:251,30,1,0
-BRDA:251,30,2,0
-BRF:64
+BRDA:45,2,0,0
+BRDA:45,2,1,0
+BRDA:59,3,0,0
+BRDA:59,3,1,0
+BRDA:83,4,0,0
+BRDA:83,4,1,0
+BRDA:96,5,0,2
+BRDA:96,5,1,14
+BRDA:105,6,0,2
+BRDA:105,6,1,12
+BRDA:112,7,0,0
+BRDA:112,7,1,14
+BRDA:121,8,0,12
+BRDA:121,8,1,2
+BRDA:129,9,0,0
+BRDA:129,9,1,14
+BRDA:138,10,0,1
+BRDA:138,10,1,13
+BRDA:139,11,0,14
+BRDA:139,11,1,12
+BRDA:139,11,2,1
+BRDA:139,11,3,1
+BRDA:151,12,0,0
+BRDA:151,12,1,13
+BRDA:156,13,0,11
+BRDA:156,13,1,2
+BRDA:161,14,0,0
+BRDA:161,14,1,13
+BRDA:168,15,0,0
+BRDA:168,15,1,13
+BRDA:196,16,0,5
+BRDA:196,16,1,1
+BRDA:197,17,0,0
+BRDA:197,17,1,5
+BRDA:211,18,0,0
+BRDA:211,18,1,14
+BRDA:211,19,0,14
+BRDA:211,19,1,14
+BRDA:214,20,0,14
+BRDA:214,20,1,13
+BRDA:215,21,0,14
+BRDA:215,21,1,3
+BRDA:217,22,0,2
+BRDA:217,22,1,0
+BRDA:221,23,0,9
+BRDA:221,23,1,5
+BRDA:226,24,0,0
+BRDA:226,24,1,6
+BRDA:254,25,0,0
+BRDA:255,26,0,0
+BRDA:255,26,1,12
+BRDA:259,27,0,0
+BRDA:259,27,1,19
+BRDA:262,28,0,0
+BRDA:262,28,1,19
+BRDA:265,29,0,19
+BRDA:265,29,1,0
+BRDA:276,30,0,0
+BRDA:276,30,1,12
+BRDA:277,31,0,12
+BRDA:277,31,1,12
+BRDA:277,31,2,12
+BRDA:283,32,0,0
+BRDA:283,32,1,0
+BRDA:283,32,2,0
+BRF:68
 BRH:43
 end_of_record
 TN:

package/dist/environment.js

@@ -62,6 +62,7 @@ module.exports = {
     ALLOW_DEV_AUTOMATIONS: process.env.ALLOW_DEV_AUTOMATIONS,
     DISABLE_THREADING: process.env.DISABLE_THREADING,
     QUERY_THREAD_TIMEOUT: process.env.QUERY_THREAD_TIMEOUT,
+    SQL_MAX_ROWS: process.env.SQL_MAX_ROWS,
     _set(key, value) {
         process.env[key] = value;
         module.exports[key] = value;

package/dist/integrations/base/sql.js

@@ -16,7 +16,11 @@ const knex_1 = require("knex");
 const datasource_1 = require("../../definitions/datasource");
 const utils_1 = require("../utils");
 const sqlTable_1 = __importDefault(require("./sqlTable"));
-const BASE_LIMIT = 5000;
+const environment_1 = __importDefault(require("../../environment"));
+const envLimit = environment_1.default.SQL_MAX_ROWS
+    ? parseInt(environment_1.default.SQL_MAX_ROWS)
+    : null;
+const BASE_LIMIT = envLimit || 5000;
 // these are invalid dates sent by the client, need to convert them to a real max date
 const MIN_ISO_DATE = "0000-00-00T00:00:00.000Z";
 const MAX_ISO_DATE = "9999-00-00T00:00:00.000Z";

package/dist/package.json

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

package/dist/threads/query.js

@@ -38,10 +38,11 @@ class QueryRunner {
             return fields;
         }
         const bindings = findHBSBlocks(sql);
-        let variables = [];
+        let variables = [], arrays = [];
         for (let binding of bindings) {
-            let variable = integration.getBindingIdentifier();
-            variables.push(binding);
+            // look for array/list operations in the SQL statement, which will need handled later
+            const listRegex = new RegExp(`(in|IN|In|iN)( )+${binding}`);
+            const listRegexMatch = sql.match(listRegex);
             // check if the variable was used as part of a string concat e.g. 'Hello {{binding}}'
             const charConstRegex = new RegExp(`'[^']*${binding}[^']*'`);
             const charConstMatch = sql.match(charConstRegex);
@@ -49,15 +50,41 @@ class QueryRunner {
                 let [part1, part2] = charConstMatch[0].split(binding);
                 part1 = `'${part1.substring(1)}'`;
                 part2 = `'${part2.substring(0, part2.length - 1)}'`;
-                sql = sql.replace(charConstMatch[0], integration.getStringConcat([part1, variable, part2]));
+                sql = sql.replace(charConstMatch[0], integration.getStringConcat([
+                    part1,
+                    integration.getBindingIdentifier(),
+                    part2,
+                ]));
+            }
+            // generate SQL parameterised array
+            else if (listRegexMatch) {
+                arrays.push(binding);
+                // determine the length of the array
+                const value = this.enrichQueryFields([binding], parameters)[0].split(",");
+                // build a string like ($1, $2, $3)
+                sql = sql.replace(binding, `(${Array.apply(null, Array(value.length))
+                    .map(() => integration.getBindingIdentifier())
+                    .join(",")})`);
             }
             else {
-                sql = sql.replace(binding, variable);
+                sql = sql.replace(binding, integration.getBindingIdentifier());
             }
+            variables.push(binding);
         }
         // replicate the knex structure
         fields.sql = sql;
         fields.bindings = this.enrichQueryFields(variables, parameters);
+        // check for arrays in the data
+        let updated = [];
+        for (let i = 0; i < variables.length; i++) {
+            if (arrays.includes(variables[i])) {
+                updated = updated.concat(fields.bindings[i].split(","));
+            }
+            else {
+                updated.push(fields.bindings[i]);
+            }
+        }
+        fields.bindings = updated;
         return fields;
     }
     execute() {