@budibase/server 1.0.49-alpha.8 → 1.0.49-alpha.9

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

@@ -95,7 +95,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 Wed Feb 02 2022 10:59:03 GMT+0000 (Coordinated Universal Time)
+                at Thu Feb 03 2022 20:58:15 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

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

@@ -95,7 +95,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 Wed Feb 02 2022 10:59:03 GMT+0000 (Coordinated Universal Time)
+                at Thu Feb 03 2022 20:58:15 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

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

@@ -139,7 +139,7 @@ exports.createRoutingView = createRoutingView
             <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 02 2022 10:59:03 GMT+0000 (Coordinated Universal Time)
+                at Thu Feb 03 2022 20:58:15 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

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

@@ -110,7 +110,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 Wed Feb 02 2022 10:59:03 GMT+0000 (Coordinated Universal Time)
+                at Thu Feb 03 2022 20:58:15 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

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

@@ -1081,7 +1081,7 @@ exports.cleanupAttachments = async (table, { row, rows, oldRow, oldTable }) =&gt
             <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 02 2022 10:59:03 GMT+0000 (Coordinated Universal Time)
+                at Thu Feb 03 2022 20:58:15 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

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 Wed Feb 02 2022 10:59:03 GMT+0000 (Coordinated Universal Time)
+                at Thu Feb 03 2022 20:58:15 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 Wed Feb 02 2022 10:59:03 GMT+0000 (Coordinated Universal Time)
+                at Thu Feb 03 2022 20:58:15 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 Wed Feb 02 2022 10:59:03 GMT+0000 (Coordinated Universal Time)
+                at Thu Feb 03 2022 20:58:15 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 Wed Feb 02 2022 10:59:03 GMT+0000 (Coordinated Universal Time)
+                at Thu Feb 03 2022 20:58:15 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 Wed Feb 02 2022 10:59:03 GMT+0000 (Coordinated Universal Time)
+                at Thu Feb 03 2022 20:58:15 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 Wed Feb 02 2022 10:59:03 GMT+0000 (Coordinated Universal Time)
+                at Thu Feb 03 2022 20:58:15 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 Wed Feb 02 2022 10:59:03 GMT+0000 (Coordinated Universal Time)
+                at Thu Feb 03 2022 20:58:15 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 02 2022 10:59:03 GMT+0000 (Coordinated Universal Time)
+                at Thu Feb 03 2022 20:58:15 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 02 2022 10:59:03 GMT+0000 (Coordinated Universal Time)
+                at Thu Feb 03 2022 20:58:15 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 02 2022 10:59:03 GMT+0000 (Coordinated Universal Time)
+                at Thu Feb 03 2022 20:58:15 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

package/coverage/lcov.info

@@ -8200,20 +8200,20 @@ BRH:10
 end_of_record
 TN:
 SF:src/threads/query.js
-FN:12,(anonymous_0)
-FN:29,(anonymous_1)
-FN:91,(anonymous_2)
-FN:92,(anonymous_3)
-FN:105,(anonymous_4)
-FN:121,(anonymous_5)
-FN:139,(anonymous_6)
-FN:154,(anonymous_7)
-FN:163,(anonymous_8)
-FN:178,(anonymous_9)
-FN:223,(anonymous_10)
-FN:224,(anonymous_11)
-FN:227,(anonymous_12)
-FN:230,(anonymous_13)
+FN:9,(anonymous_0)
+FN:26,(anonymous_1)
+FN:88,(anonymous_2)
+FN:89,(anonymous_3)
+FN:102,(anonymous_4)
+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)
 FNF:14
 FNH:13
 FNDA:15,(anonymous_0)
@@ -8236,178 +8236,169 @@ DA:3,2
 DA:4,2
 DA:5,2
 DA:6,2
-DA:8,2
-DA:9,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:19,15
-DA:20,15
-DA:21,15
-DA:25,15
-DA:26,15
+DA:22,15
+DA:23,15
+DA:27,16
+DA:29,16
 DA:30,16
-DA:32,16
 DA:33,16
-DA:36,16
-DA:37,0
-DA:40,16
-DA:41,16
-DA:42,2
+DA:34,0
+DA:37,16
+DA:38,16
+DA:39,2
+DA:41,14
+DA:43,14
 DA:44,14
+DA:45,14
 DA:46,14
 DA:47,14
 DA:48,14
-DA:49,14
-DA:50,14
-DA:51,14
+DA:49,12
+DA:50,12
+DA:51,12
 DA:52,12
-DA:53,12
-DA:54,12
-DA:55,12
-DA:59,14
-DA:60,0
-DA:64,0
-DA:68,14
+DA:56,14
+DA:57,0
+DA:61,0
+DA:65,14
+DA:71,1
+DA:73,1
 DA:74,1
-DA:76,1
-DA:77,1
-DA:81,13
-DA:82,0
-DA:86,13
-DA:87,11
-DA:91,13
-DA:92,0
-DA:96,13
-DA:98,13
-DA:99,0
-DA:102,13
+DA:78,13
+DA:79,0
+DA:83,13
+DA:84,11
+DA:88,13
+DA:89,0
+DA:93,13
+DA:95,13
+DA:96,0
+DA:99,13
+DA:103,5
+DA:104,5
+DA:105,5
 DA:106,5
-DA:107,5
-DA:108,5
-DA:109,5
+DA:119,6
+DA:120,6
+DA:121,6
 DA:122,6
 DA:123,6
-DA:124,6
-DA:125,6
-DA:126,6
-DA:127,5
-DA:131,5
-DA:132,5
-DA:134,1
-DA:136,6
-DA:140,16
+DA:124,5
+DA:128,5
+DA:129,5
+DA:131,1
+DA:133,6
+DA:137,16
+DA:138,16
+DA:139,0
 DA:141,16
-DA:142,0
-DA:144,16
-DA:145,16
-DA:146,16
-DA:147,2
-DA:148,2
-DA:151,16
-DA:153,11
-DA:154,11
-DA:156,6
-DA:157,0
-DA:160,6
-DA:161,6
-DA:163,11
-DA:164,11
-DA:165,11
-DA:166,6
-DA:167,6
-DA:172,6
-DA:175,16
+DA:142,16
+DA:143,16
+DA:144,2
+DA:145,2
+DA:148,16
+DA:150,11
+DA:151,11
+DA:153,6
+DA:154,0
+DA:157,6
+DA:158,6
+DA:160,11
+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:182,16
+DA:180,19
+DA:181,0
 DA:183,19
-DA:184,0
+DA:185,0
 DA:186,19
-DA:188,0
-DA:189,19
-DA:191,19
-DA:193,19
-DA:194,0
-DA:196,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:114
-LH:99
-BRDA:12,0,0,10
-BRDA:36,1,0,0
-BRDA:36,1,1,16
-BRDA:41,2,0,2
-BRDA:41,2,1,14
-BRDA:51,3,0,12
-BRDA:51,3,1,2
-BRDA:59,4,0,0
-BRDA:59,4,1,14
-BRDA:68,5,0,1
-BRDA:68,5,1,13
-BRDA:69,6,0,14
-BRDA:69,6,1,12
-BRDA:69,6,2,1
-BRDA:69,6,3,1
-BRDA:81,7,0,0
-BRDA:81,7,1,13
-BRDA:86,8,0,11
-BRDA:86,8,1,2
-BRDA:91,9,0,0
-BRDA:91,9,1,13
-BRDA:98,10,0,0
-BRDA:98,10,1,13
-BRDA:126,11,0,5
-BRDA:126,11,1,1
-BRDA:127,12,0,0
-BRDA:127,12,1,5
-BRDA:141,13,0,0
-BRDA:141,13,1,16
-BRDA:141,14,0,16
-BRDA:141,14,1,16
-BRDA:144,15,0,16
-BRDA:144,15,1,15
-BRDA:145,16,0,16
-BRDA:145,16,1,5
-BRDA:147,17,0,2
-BRDA:147,17,1,0
-BRDA:151,18,0,11
-BRDA:151,18,1,5
-BRDA:156,19,0,0
-BRDA:156,19,1,6
-BRDA:178,20,0,0
-BRDA:183,21,0,0
-BRDA:183,21,1,19
-BRDA:186,22,0,0
-BRDA:186,22,1,19
-BRDA:189,23,0,19
-BRDA:189,23,1,0
-BRDA:193,24,0,0
-BRDA:193,24,1,19
-BRDA:193,25,0,19
-BRDA:193,25,1,0
+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
+LF:109
+LH:95
+BRDA:9,0,0,10
+BRDA:33,1,0,0
+BRDA:33,1,1,16
+BRDA:38,2,0,2
+BRDA:38,2,1,14
+BRDA:48,3,0,12
+BRDA:48,3,1,2
+BRDA:56,4,0,0
+BRDA:56,4,1,14
+BRDA:65,5,0,1
+BRDA:65,5,1,13
+BRDA:66,6,0,14
+BRDA:66,6,1,12
+BRDA:66,6,2,1
+BRDA:66,6,3,1
+BRDA:78,7,0,0
+BRDA:78,7,1,13
+BRDA:83,8,0,11
+BRDA:83,8,1,2
+BRDA:88,9,0,0
+BRDA:88,9,1,13
+BRDA:95,10,0,0
+BRDA:95,10,1,13
+BRDA:123,11,0,5
+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:144,17,0,2
+BRDA:144,17,1,0
+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,16
-BRDA:204,27,0,16
-BRDA:204,27,1,16
-BRDA:204,27,2,16
-BRDA:210,28,0,0
-BRDA:210,28,1,0
-BRDA:210,28,2,0
-BRF:60
-BRH:41
+BRDA:203,26,1,0
+BRDA:203,26,2,0
+BRF:56
+BRH:39
 end_of_record
 TN:
 SF:src/threads/utils.js

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

@@ -155,7 +155,7 @@ var External;
         thisRow._id = generateIdForRow(row, table);
         thisRow.tableId = table._id;
         thisRow._rev = "rev";
-        return thisRow;
+        return utils_4.processFormulas(table, thisRow);
     }
     function fixArrayTypes(row, table) {
         for (let [fieldName, schema] of Object.entries(table.schema)) {
@@ -278,14 +278,24 @@ var External;
          * This iterates through the returned rows and works out what elements of the rows
          * actually match up to another row (based on primary keys) - this is pretty specific
          * to SQL and the way that SQL relationships are returned based on joins.
+         * This is complicated, but the idea is that when a SQL query returns all the relations
+         * will be separate rows, with all of the data in each row. We have to decipher what comes
+         * from where (which tables) and how to convert that into budibase columns.
          */
-        updateRelationshipColumns(row, rows, relationships) {
+        updateRelationshipColumns(table, row, rows, relationships) {
             const columns = {};
             for (let relationship of relationships) {
                 const linkedTable = this.tables[relationship.tableName];
                 if (!linkedTable) {
                     continue;
                 }
+                const fromColumn = `${table.name}.${relationship.from}`;
+                const toColumn = `${linkedTable.name}.${relationship.to}`;
+                // this is important when working with multiple relationships
+                // between the same tables, don't want to overlap/multiply the relations
+                if (!relationship.through && row[fromColumn] !== row[toColumn]) {
+                    continue;
+                }
                 let linked = basicProcessing(row, linkedTable);
                 if (!linked._id) {
                     continue;
@@ -323,7 +333,7 @@ var External;
                 row._id = rowId;
                 // this is a relationship of some sort
                 if (finalRows[rowId]) {
-                    finalRows = this.updateRelationshipColumns(row, finalRows, relationships);
+                    finalRows = this.updateRelationshipColumns(table, row, finalRows, relationships);
                     continue;
                 }
                 const thisRow = fixArrayTypes(basicProcessing(row, table), table);
@@ -332,7 +342,7 @@ var External;
                 }
                 finalRows[thisRow._id] = thisRow;
                 // do this at end once its been added to the final rows
-                finalRows = this.updateRelationshipColumns(row, finalRows, relationships);
+                finalRows = this.updateRelationshipColumns(table, row, finalRows, relationships);
             }
             return utils_4.processFormulas(table, Object.values(finalRows));
         }

package/dist/integrations/base/sql.js

@@ -177,20 +177,55 @@ class InternalBuilder {
         if (!relationships) {
             return query;
         }
+        const tableSets = {};
+        // aggregate into table sets (all the same to tables)
         for (let relationship of relationships) {
-            const from = relationship.from, to = relationship.to, toTable = relationship.tableName;
-            if (!relationship.through) {
+            const keyObj = {
+                toTable: relationship.tableName,
+                throughTable: undefined,
+            };
+            if (relationship.through) {
+                keyObj.throughTable = relationship.through;
+            }
+            const key = JSON.stringify(keyObj);
+            if (tableSets[key]) {
+                tableSets[key].push(relationship);
+            }
+            else {
+                tableSets[key] = [relationship];
+            }
+        }
+        for (let [key, relationships] of Object.entries(tableSets)) {
+            const { toTable, throughTable } = JSON.parse(key);
+            if (!throughTable) {
                 // @ts-ignore
-                query = query.leftJoin(toTable, `${fromTable}.${from}`, `${toTable}.${to}`);
+                query = query.join(toTable, function () {
+                    for (let relationship of relationships) {
+                        const from = relationship.from, to = relationship.to;
+                        // @ts-ignore
+                        this.orOn(`${fromTable}.${from}`, "=", `${toTable}.${to}`);
+                    }
+                }, "left");
             }
             else {
-                const throughTable = relationship.through;
-                const fromPrimary = relationship.fromPrimary;
-                const toPrimary = relationship.toPrimary;
                 query = query
                     // @ts-ignore
-                    .leftJoin(throughTable, `${fromTable}.${fromPrimary}`, `${throughTable}.${from}`)
-                    .leftJoin(toTable, `${toTable}.${toPrimary}`, `${throughTable}.${to}`);
+                    .join(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 () {
+                    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.49-alpha.7",
+    "version": "1.0.49-alpha.8",
     "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.49-alpha.7",
-        "@budibase/client": "^1.0.49-alpha.7",
-        "@budibase/string-templates": "^1.0.49-alpha.7",
+        "@budibase/backend-core": "^1.0.49-alpha.8",
+        "@budibase/client": "^1.0.49-alpha.8",
+        "@budibase/string-templates": "^1.0.49-alpha.8",
         "@bull-board/api": "^3.7.0",
         "@bull-board/koa": "^3.7.0",
         "@elastic/elasticsearch": "7.10.0",