@budibase/server 1.0.46-alpha.8 → 1.0.49-alpha.0

package/dist/api/controllers/table/utils.js

@@ -14,7 +14,7 @@ const { getRowParams, generateRowID, InternalTables, } = require("../../../db/ut
 const { isEqual } = require("lodash/fp");
 const { AutoFieldSubTypes, FieldTypes } = require("../../../constants");
 const { inputProcessing } = require("../../../utilities/rowProcessor");
-const { USERS_TABLE_SCHEMA, SwitchableTypes } = require("../../../constants");
+const { USERS_TABLE_SCHEMA, SwitchableTypes, CanSwitchTypes, } = require("../../../constants");
 const { isExternalTable, breakExternalTableId, isSQL, } = require("../../../integrations/utils");
 const { getViews, saveView } = require("../view/utils");
 const viewTemplate = require("../view/viewBuilder");
@@ -302,6 +302,19 @@ exports.foreignKeyStructure = (keyName, meta = null) => {
     }
     return structure;
 };
+exports.areSwitchableTypes = (type1, type2) => {
+    if (SwitchableTypes.indexOf(type1) === -1 &&
+        SwitchableTypes.indexOf(type2) === -1) {
+        return false;
+    }
+    for (let option of CanSwitchTypes) {
+        const index1 = option.indexOf(type1), index2 = option.indexOf(type2);
+        if (index1 !== -1 && index2 !== -1 && index1 !== index2) {
+            return true;
+        }
+    }
+    return false;
+};
 exports.hasTypeChanged = (table, oldTable) => {
     if (!oldTable) {
         return false;
@@ -312,7 +325,7 @@ exports.hasTypeChanged = (table, oldTable) => {
             continue;
         }
         const newType = table.schema[key].type;
-        if (oldType !== newType && SwitchableTypes.indexOf(oldType) === -1) {
+        if (oldType !== newType && !exports.areSwitchableTypes(oldType, newType)) {
             return true;
         }
     }

package/dist/constants/index.js

@@ -41,12 +41,12 @@ exports.FieldTypes = {
     JSON: "json",
     INTERNAL: "internal",
 };
-exports.SwitchableTypes = [
-    exports.FieldTypes.STRING,
-    exports.FieldTypes.OPTIONS,
-    exports.FieldTypes.NUMBER,
-    exports.FieldTypes.BOOLEAN,
+exports.CanSwitchTypes = [
+    [exports.FieldTypes.JSON, exports.FieldTypes.ARRAY],
+    [exports.FieldTypes.STRING, exports.FieldTypes.OPTIONS],
+    [exports.FieldTypes.BOOLEAN, exports.FieldTypes.NUMBER],
 ];
+exports.SwitchableTypes = exports.CanSwitchTypes.reduce((prev, current) => prev ? prev.concat(current) : current);
 exports.RelationshipTypes = {
     ONE_TO_MANY: "one-to-many",
     MANY_TO_ONE: "many-to-one",

package/dist/integrations/utils.js

@@ -167,6 +167,7 @@ function shouldCopyRelationship(column, tableIds) {
  */
 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));
 }

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "1.0.46-alpha.7",
+    "version": "1.0.48",
     "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.46-alpha.7",
-        "@budibase/client": "^1.0.46-alpha.7",
-        "@budibase/string-templates": "^1.0.46-alpha.7",
+        "@budibase/backend-core": "^1.0.48",
+        "@budibase/client": "^1.0.48",
+        "@budibase/string-templates": "^1.0.48",
         "@bull-board/api": "^3.7.0",
         "@bull-board/koa": "^3.7.0",
         "@elastic/elasticsearch": "7.10.0",