@budibase/server 1.1.33-alpha.0 → 1.2.3

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

@@ -205,7 +205,7 @@ exports.publicApiUserFix = ctx => {
             <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 Mon Aug 01 2022 16:08:45 GMT+0000 (Coordinated Universal Time)
+                at Tue Aug 02 2022 10:55:23 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../prettify.js"></script>
         <script>

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

@@ -535,7 +535,7 @@ exports.getChecklist = <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 Mon Aug 01 2022 16:08:45 GMT+0000 (Coordinated Universal Time)
+                at Tue Aug 02 2022 10:55:23 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../prettify.js"></script>
         <script>

package/coverage/lcov.info

@@ -1799,11 +1799,11 @@ FN:77,(anonymous_6)
 FN:86,(anonymous_7)
 FN:98,(anonymous_8)
 FN:101,(anonymous_9)
-FN:152,(anonymous_10)
-FN:157,(anonymous_11)
-FN:169,(anonymous_12)
-FN:198,(anonymous_13)
-FN:228,(anonymous_14)
+FN:162,(anonymous_10)
+FN:167,(anonymous_11)
+FN:179,(anonymous_12)
+FN:208,(anonymous_13)
+FN:238,(anonymous_14)
 FNF:15
 FNH:0
 FNDA:0,handleRequest
@@ -1886,58 +1886,62 @@ DA:122,0
 DA:124,0
 DA:127,0
 DA:131,0
-DA:136,0
+DA:132,0
 DA:137,0
 DA:138,0
-DA:146,0
-DA:149,0
-DA:152,44
-DA:154,0
-DA:157,44
-DA:158,0
-DA:159,0
-DA:160,0
-DA:161,0
-DA:162,0
-DA:163,0
+DA:139,0
+DA:147,0
+DA:150,0
+DA:152,0
+DA:153,0
+DA:157,0
+DA:162,44
 DA:164,0
-DA:166,0
+DA:167,44
+DA:168,0
 DA:169,0
+DA:170,0
+DA:171,0
+DA:172,0
+DA:173,0
 DA:174,0
-DA:175,0
-DA:178,0
+DA:176,0
 DA:179,0
-DA:180,0
-DA:181,0
-DA:182,0
-DA:186,0
+DA:184,0
+DA:185,0
+DA:188,0
 DA:189,0
 DA:190,0
 DA:191,0
-DA:194,0
-DA:195,0
-DA:198,44
+DA:192,0
+DA:196,0
 DA:199,0
 DA:200,0
 DA:201,0
-DA:202,0
-DA:203,0
 DA:204,0
 DA:205,0
-DA:207,0
-DA:208,0
+DA:208,44
+DA:209,0
+DA:210,0
+DA:211,0
 DA:212,0
 DA:213,0
-DA:216,0
+DA:214,0
+DA:215,0
 DA:217,0
+DA:218,0
 DA:222,0
-DA:224,0
-DA:225,0
+DA:223,0
 DA:226,0
-DA:228,0
-DA:229,0
-DA:242,0
-LF:116
+DA:227,0
+DA:232,0
+DA:234,0
+DA:235,0
+DA:236,0
+DA:238,0
+DA:239,0
+DA:252,0
+LF:120
 LH:18
 BRDA:16,0,0,0
 BRDA:18,1,0,0
@@ -1968,28 +1972,32 @@ BRDA:122,13,0,0
 BRDA:122,13,1,0
 BRDA:124,14,0,0
 BRDA:124,14,1,0
-BRDA:137,15,0,0
-BRDA:137,15,1,0
-BRDA:137,16,0,0
-BRDA:137,16,1,0
-BRDA:163,17,0,0
-BRDA:163,17,1,0
-BRDA:163,18,0,0
-BRDA:163,18,1,0
-BRDA:178,19,0,0
-BRDA:178,19,1,0
-BRDA:178,20,0,0
-BRDA:178,20,1,0
-BRDA:204,21,0,0
-BRDA:204,21,1,0
-BRDA:204,22,0,0
-BRDA:204,22,1,0
-BRDA:217,23,0,0
-BRDA:217,23,1,0
-BRDA:218,24,0,0
-BRDA:218,24,1,0
-BRDA:218,24,2,0
-BRF:50
+BRDA:138,15,0,0
+BRDA:138,15,1,0
+BRDA:138,16,0,0
+BRDA:138,16,1,0
+BRDA:152,17,0,0
+BRDA:152,17,1,0
+BRDA:152,18,0,0
+BRDA:152,18,1,0
+BRDA:173,19,0,0
+BRDA:173,19,1,0
+BRDA:173,20,0,0
+BRDA:173,20,1,0
+BRDA:188,21,0,0
+BRDA:188,21,1,0
+BRDA:188,22,0,0
+BRDA:188,22,1,0
+BRDA:214,23,0,0
+BRDA:214,23,1,0
+BRDA:214,24,0,0
+BRDA:214,24,1,0
+BRDA:227,25,0,0
+BRDA:227,25,1,0
+BRDA:228,26,0,0
+BRDA:228,26,1,0
+BRDA:228,26,2,0
+BRF:54
 BRH:0
 end_of_record
 TN:

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

@@ -130,25 +130,35 @@ exports.search = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
             [params.sort]: direction,
         };
     }
-    const rows = yield handleRequest(DataSourceOperation.READ, tableId, {
-        filters: query,
-        sort,
-        paginate: paginateObj,
-    });
-    let hasNextPage = false;
-    if (paginate && rows.length === limit) {
-        const nextRows = yield handleRequest(DataSourceOperation.READ, tableId, {
+    try {
+        const rows = yield handleRequest(DataSourceOperation.READ, tableId, {
             filters: query,
             sort,
-            paginate: {
-                limit: 1,
-                page: bookmark * limit + 1,
-            },
+            paginate: paginateObj,
         });
-        hasNextPage = nextRows.length > 0;
+        let hasNextPage = false;
+        if (paginate && rows.length === limit) {
+            const nextRows = yield handleRequest(DataSourceOperation.READ, tableId, {
+                filters: query,
+                sort,
+                paginate: {
+                    limit: 1,
+                    page: bookmark * limit + 1,
+                },
+            });
+            hasNextPage = nextRows.length > 0;
+        }
+        // need wrapper object for bookmarks etc when paginating
+        return { rows, hasNextPage, bookmark: bookmark + 1 };
+    }
+    catch (err) {
+        if (err.message && err.message.includes("does not exist")) {
+            throw new Error(`Table updated externally, please re-fetch - ${err.message}`);
+        }
+        else {
+            throw err;
+        }
     }
-    // need wrapper object for bookmarks etc when paginating
-    return { rows, hasNextPage, bookmark: bookmark + 1 };
 });
 exports.validate = () => __awaiter(void 0, void 0, void 0, function* () {
     // can't validate external right now - maybe in future

package/dist/integrations/utils.js

@@ -202,8 +202,9 @@ function shouldCopySpecialColumn(column, fetchedColumn) {
         constants_1.FieldTypes.ARRAY,
         constants_1.FieldTypes.FORMULA,
     ];
+    // column has been deleted, remove
     if (column && !fetchedColumn) {
-        return true;
+        return false;
     }
     const fetchedIsNumber = !fetchedColumn || fetchedColumn.type === constants_1.FieldTypes.NUMBER;
     return (specialTypes.indexOf(column.type) !== -1 ||

package/dist/package.json

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