@budibase/server 1.0.128 → 1.0.129

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

@@ -116,7 +116,7 @@
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Thu Apr 28 2022 08:24:11 GMT+0000 (Coordinated Universal Time)
+                at Thu Apr 28 2022 10:18:48 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

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

@@ -307,7 +307,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" rel="noopener noreferrer">istanbul</a>
-                at Thu Apr 28 2022 08:24:11 GMT+0000 (Coordinated Universal Time)
+                at Thu Apr 28 2022 10:18:48 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

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

@@ -124,7 +124,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" rel="noopener noreferrer">istanbul</a>
-                at Thu Apr 28 2022 08:24:11 GMT+0000 (Coordinated Universal Time)
+                at Thu Apr 28 2022 10:18:48 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

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

@@ -142,7 +142,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" rel="noopener noreferrer">istanbul</a>
-                at Thu Apr 28 2022 08:24:11 GMT+0000 (Coordinated Universal Time)
+                at Thu Apr 28 2022 10:18:48 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../prettify.js"></script>
         <script>

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

@@ -487,7 +487,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" rel="noopener noreferrer">istanbul</a>
-                at Thu Apr 28 2022 08:24:11 GMT+0000 (Coordinated Universal Time)
+                at Thu Apr 28 2022 10:18:48 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../prettify.js"></script>
         <script>

package/coverage/lcov.info

@@ -2289,10 +2289,10 @@ FN:221,(anonymous_25)
 FN:226,(anonymous_26)
 FN:243,(anonymous_27)
 FN:259,(anonymous_28)
-FN:270,(anonymous_29)
-FN:294,(anonymous_30)
-FN:342,(anonymous_31)
-FN:387,(anonymous_32)
+FN:273,(anonymous_29)
+FN:297,(anonymous_30)
+FN:345,(anonymous_31)
+FN:390,(anonymous_32)
 FNF:33
 FNH:18
 FNDA:1,(anonymous_0)
@@ -2438,50 +2438,51 @@ DA:238,0
 DA:240,1
 DA:244,1
 DA:245,1
+DA:246,1
+DA:247,1
 DA:248,1
-DA:249,1
 DA:259,40
 DA:260,1
-DA:264,1
-DA:266,1
+DA:267,1
 DA:269,1
-DA:270,1
 DA:272,1
 DA:273,1
 DA:275,1
-DA:294,40
-DA:295,1
-DA:296,1
-DA:297,1
-DA:298,0
+DA:276,1
+DA:278,1
+DA:297,40
+DA:298,1
+DA:299,1
 DA:300,1
-DA:301,1
-DA:302,0
+DA:301,0
+DA:303,1
 DA:304,1
-DA:313,1
-DA:314,0
+DA:305,0
+DA:307,1
 DA:316,1
-DA:317,1
-DA:319,0
-DA:324,0
-DA:342,40
-DA:343,0
-DA:344,0
-DA:345,0
+DA:317,0
+DA:319,1
+DA:320,1
+DA:322,0
+DA:327,0
+DA:345,40
+DA:346,0
 DA:347,0
 DA:348,0
-DA:354,0
-DA:361,0
-DA:366,0
-DA:387,40
-DA:388,1
-DA:389,1
-DA:390,1
+DA:350,0
+DA:351,0
+DA:357,0
+DA:364,0
+DA:369,0
+DA:390,40
+DA:391,1
 DA:392,1
 DA:393,1
-DA:394,1
-LF:152
-LH:93
+DA:395,1
+DA:396,1
+DA:397,1
+LF:153
+LH:94
 BRDA:40,0,0,1
 BRDA:40,0,1,0
 BRDA:47,1,0,0
@@ -2549,34 +2550,34 @@ BRDA:235,32,0,0
 BRDA:235,32,1,1
 BRDA:236,33,0,0
 BRDA:236,33,1,0
-BRDA:269,34,0,1
-BRDA:269,34,1,0
-BRDA:269,35,0,1
-BRDA:269,35,1,1
-BRDA:272,36,0,1
-BRDA:272,36,1,0
-BRDA:296,37,0,1
-BRDA:296,37,1,1
-BRDA:297,38,0,0
-BRDA:297,38,1,1
-BRDA:301,39,0,0
-BRDA:301,39,1,1
-BRDA:313,40,0,0
-BRDA:313,40,1,1
-BRDA:316,41,0,1
-BRDA:316,41,1,0
-BRDA:344,42,0,0
-BRDA:344,42,1,0
-BRDA:344,43,0,0
-BRDA:344,43,1,0
-BRDA:344,43,2,0
-BRDA:368,44,0,0
-BRDA:368,44,1,0
-BRDA:389,45,0,1
-BRDA:389,45,1,0
-BRDA:389,46,0,1
-BRDA:389,46,1,0
-BRDA:389,46,2,0
+BRDA:272,34,0,1
+BRDA:272,34,1,0
+BRDA:272,35,0,1
+BRDA:272,35,1,1
+BRDA:275,36,0,1
+BRDA:275,36,1,0
+BRDA:299,37,0,1
+BRDA:299,37,1,1
+BRDA:300,38,0,0
+BRDA:300,38,1,1
+BRDA:304,39,0,0
+BRDA:304,39,1,1
+BRDA:316,40,0,0
+BRDA:316,40,1,1
+BRDA:319,41,0,1
+BRDA:319,41,1,0
+BRDA:347,42,0,0
+BRDA:347,42,1,0
+BRDA:347,43,0,0
+BRDA:347,43,1,0
+BRDA:347,43,2,0
+BRDA:371,44,0,0
+BRDA:371,44,1,0
+BRDA:392,45,0,1
+BRDA:392,45,1,0
+BRDA:392,46,0,1
+BRDA:392,46,1,0
+BRDA:392,46,2,0
 BRF:95
 BRH:38
 end_of_record
@@ -5025,7 +5026,7 @@ BRH:0
 end_of_record
 TN:
 SF:src/constants/index.js
-FN:54,(anonymous_0)
+FN:58,(anonymous_0)
 FNF:1
 FNH:1
 FNDA:96,(anonymous_0)
@@ -5038,29 +5039,29 @@ DA:22,48
 DA:23,48
 DA:32,48
 DA:48,48
-DA:54,48
-DA:55,96
 DA:58,48
-DA:64,48
-DA:69,48
-DA:75,48
-DA:86,48
+DA:59,96
+DA:62,48
+DA:68,48
+DA:73,48
+DA:79,48
 DA:90,48
-DA:95,48
-DA:157,48
-DA:165,48
-DA:173,48
-DA:174,48
-DA:181,48
-DA:186,48
-DA:192,48
-DA:197,48
+DA:94,48
+DA:99,48
+DA:161,48
+DA:169,48
+DA:177,48
+DA:178,48
+DA:185,48
+DA:190,48
+DA:196,48
 DA:201,48
-DA:208,48
+DA:205,48
+DA:212,48
 LF:28
 LH:28
-BRDA:55,0,0,96
-BRDA:55,0,1,0
+BRDA:59,0,0,96
+BRDA:59,0,1,0
 BRF:2
 BRH:1
 end_of_record

package/dist/api/controllers/application.js

@@ -355,11 +355,14 @@ const destroyApp = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     if (!environment_1.default.isTest() && !isUnpublish) {
         yield (0, fileSystem_1.deleteApp)(appId);
     }
+    // automations only in production
     if (isUnpublish) {
         yield (0, utils_2.cleanupAutomations)(appId);
     }
-    // make sure the app/role doesn't stick around after the app has been deleted
-    yield (0, workerRequests_1.removeAppFromUserRoles)(ctx, appId);
+    // remove app role when the dev app is deleted (no trace of app anymore)
+    else {
+        yield (0, workerRequests_1.removeAppFromUserRoles)(ctx, appId);
+    }
     yield appCache.invalidateAppMetadata(appId);
     return result;
 });

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

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 const { SearchIndexes } = require("../../../db/utils");
 const fetch = require("node-fetch");
-const { getCouchUrl } = require("@budibase/backend-core/db");
+const { getCouchInfo } = require("@budibase/backend-core/db");
 const { getAppId } = require("@budibase/backend-core/context");
 /**
  * Class to build lucene query URLs.
@@ -222,9 +222,10 @@ class QueryBuilder {
     run() {
         return __awaiter(this, void 0, void 0, function* () {
             const appId = getAppId();
-            const url = `${getCouchUrl()}/${appId}/_design/database/_search/${SearchIndexes.ROWS}`;
+            const { url, cookie } = getCouchInfo();
+            const fullPath = `${url}/${appId}/_design/database/_search/${SearchIndexes.ROWS}`;
             const body = this.buildSearchBody();
-            return yield runQuery(url, body);
+            return yield runQuery(fullPath, body, cookie);
         });
     }
 }
@@ -232,12 +233,16 @@ class QueryBuilder {
  * Executes a lucene search query.
  * @param url The query URL
  * @param body The request body defining search criteria
+ * @param cookie The auth cookie for CouchDB
  * @returns {Promise<{rows: []}>}
  */
-const runQuery = (url, body) => __awaiter(void 0, void 0, void 0, function* () {
+const runQuery = (url, body, cookie) => __awaiter(void 0, void 0, void 0, function* () {
     const response = yield fetch(url, {
         body: JSON.stringify(body),
         method: "POST",
+        headers: {
+            Authorization: cookie,
+        },
     });
     const json = yield response.json();
     let output = {

package/dist/constants/index.js

@@ -43,7 +43,11 @@ exports.FieldTypes = {
 };
 exports.CanSwitchTypes = [
     [exports.FieldTypes.JSON, exports.FieldTypes.ARRAY],
-    [exports.FieldTypes.STRING, exports.FieldTypes.OPTIONS],
+    [
+        exports.FieldTypes.STRING,
+        exports.FieldTypes.OPTIONS,
+        exports.FieldTypes.LONGFORM,
+    ],
     [exports.FieldTypes.BOOLEAN, exports.FieldTypes.NUMBER],
 ];
 exports.SwitchableTypes = exports.CanSwitchTypes.reduce((prev, current) => prev ? prev.concat(current) : current);

package/dist/integrations/utils.js

@@ -40,9 +40,9 @@ const SQL_STRING_TYPE_MAP = {
     nvarchar: constants_1.FieldTypes.STRING,
     ntext: constants_1.FieldTypes.STRING,
     enum: constants_1.FieldTypes.STRING,
-    blob: constants_1.FieldTypes.LONGFORM,
-    long: constants_1.FieldTypes.LONGFORM,
-    text: constants_1.FieldTypes.LONGFORM,
+    blob: constants_1.FieldTypes.STRING,
+    long: constants_1.FieldTypes.STRING,
+    text: constants_1.FieldTypes.STRING,
 };
 const SQL_BOOLEAN_TYPE_MAP = {
     boolean: constants_1.FieldTypes.BOOLEAN,
@@ -186,10 +186,18 @@ function shouldCopyRelationship(column, tableIds) {
  * @param fetchedColumn The fetched column to check for the type in the external database.
  */
 function shouldCopySpecialColumn(column, fetchedColumn) {
-    return (column.type === constants_1.FieldTypes.OPTIONS ||
-        column.type === constants_1.FieldTypes.ARRAY ||
-        ((!fetchedColumn || fetchedColumn.type === constants_1.FieldTypes.NUMBER) &&
-            column.type === constants_1.FieldTypes.BOOLEAN));
+    const specialTypes = [
+        constants_1.FieldTypes.OPTIONS,
+        constants_1.FieldTypes.LONGFORM,
+        constants_1.FieldTypes.ARRAY,
+        constants_1.FieldTypes.FORMULA,
+    ];
+    if (column && !fetchedColumn) {
+        return true;
+    }
+    const fetchedIsNumber = !fetchedColumn || fetchedColumn.type === constants_1.FieldTypes.NUMBER;
+    return (specialTypes.indexOf(column.type) !== -1 ||
+        (fetchedIsNumber && column.type === constants_1.FieldTypes.BOOLEAN));
 }
 /**
  * Looks for columns which need to be copied over into the new table definitions, like relationships

package/dist/package.json

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