@budibase/server 1.1.33-alpha.3 → 1.2.4

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.1.33-alpha.3",
+  "version": "1.2.4",
   "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.33-alpha.3",
-    "@budibase/client": "1.1.33-alpha.3",
-    "@budibase/pro": "1.1.33-alpha.2",
-    "@budibase/string-templates": "1.1.33-alpha.3",
-    "@budibase/types": "1.1.33-alpha.3",
+    "@budibase/backend-core": "^1.2.4",
+    "@budibase/client": "^1.2.4",
+    "@budibase/pro": "1.2.3",
+    "@budibase/string-templates": "^1.2.4",
+    "@budibase/types": "^1.2.4",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
@@ -106,7 +106,7 @@
     "google-auth-library": "7.12.0",
     "google-spreadsheet": "3.2.0",
     "jimp": "0.16.1",
-    "joi": "17.6.0",
+    "joi": "17.2.1",
     "js-yaml": "4.1.0",
     "jsonschema": "1.4.0",
     "knex": "0.95.15",
@@ -195,5 +195,5 @@
   "optionalDependencies": {
     "oracledb": "5.3.0"
   },
-  "gitHead": "25b1532c4c31145f1d70c649de3732fca08d7e19"
+  "gitHead": "0995a35ea32820b60ea6dccca2561401a0a137ea"
 }

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

@@ -128,25 +128,35 @@ exports.search = async ctx => {
       [params.sort]: direction,
     }
   }
-  const rows = await handleRequest(DataSourceOperation.READ, tableId, {
-    filters: query,
-    sort,
-    paginate: paginateObj,
-  })
-  let hasNextPage = false
-  if (paginate && rows.length === limit) {
-    const nextRows = await handleRequest(DataSourceOperation.READ, tableId, {
+  try {
+    const rows = await 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 = await 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 = async () => {

package/src/integrations/utils.ts

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