@budibase/server 1.0.27-alpha.16 → 1.0.27-alpha.17

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

@@ -403,7 +403,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 Thu Jan 13 2022 14:37:54 GMT+0000 (Coordinated Universal Time)
+                at Thu Jan 13 2022 14:57:43 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

package/dist/integrations/rest.js

@@ -40,8 +40,8 @@ const coreFields = {
         enum: Object.values(BodyTypes),
     },
     pagination: {
-        type: datasource_1.DatasourceFieldTypes.OBJECT
-    }
+        type: datasource_1.DatasourceFieldTypes.OBJECT,
+    },
 };
 var RestModule;
 (function (RestModule) {
@@ -162,8 +162,8 @@ var RestModule;
                         headers,
                     },
                     pagination: {
-                        cursor: nextCursor
-                    }
+                        cursor: nextCursor,
+                    },
                 };
             });
         }
@@ -294,7 +294,7 @@ var RestModule;
         }
         _req(query) {
             return __awaiter(this, void 0, void 0, function* () {
-                const { path = "", queryString = "", headers = {}, method = "GET", disabledHeaders, bodyType, requestBody, authConfigId, pagination, paginationValues } = query;
+                const { path = "", queryString = "", headers = {}, method = "GET", disabledHeaders, bodyType, requestBody, authConfigId, pagination, paginationValues, } = query;
                 const authHeaders = this.getAuthHeaders(authConfigId);
                 this.headers = Object.assign(Object.assign(Object.assign({}, this.config.defaultHeaders), headers), authHeaders);
                 if (disabledHeaders) {

package/dist/integrations/utils.js

@@ -2,39 +2,39 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.finaliseExternalTables = exports.isIsoDateString = exports.isSQL = exports.getSqlQuery = exports.convertSqlType = exports.breakRowIdField = exports.convertRowId = exports.isRowId = exports.generateRowIdField = exports.breakExternalTableId = exports.buildExternalTableId = exports.isExternalTable = exports.SqlClients = void 0;
 const datasource_1 = require("../definitions/datasource");
-const { DocumentTypes, SEPARATOR } = require("../db/utils");
-const { FieldTypes, BuildSchemaErrors, InvalidColumns, } = require("../constants");
-const DOUBLE_SEPARATOR = `${SEPARATOR}${SEPARATOR}`;
+const utils_1 = require("../db/utils");
+const constants_1 = require("../constants");
+const DOUBLE_SEPARATOR = `${utils_1.SEPARATOR}${utils_1.SEPARATOR}`;
 const ROW_ID_REGEX = /^\[.*]$/g;
 const SQL_TYPE_MAP = {
-    text: FieldTypes.LONGFORM,
-    varchar: FieldTypes.STRING,
-    integer: FieldTypes.NUMBER,
-    bigint: FieldTypes.NUMBER,
-    decimal: FieldTypes.NUMBER,
-    smallint: FieldTypes.NUMBER,
-    real: FieldTypes.NUMBER,
-    "double precision": FieldTypes.NUMBER,
-    timestamp: FieldTypes.DATETIME,
-    time: FieldTypes.DATETIME,
-    boolean: FieldTypes.BOOLEAN,
-    json: FieldTypes.JSON,
-    date: FieldTypes.DATETIME,
-    blob: FieldTypes.LONGFORM,
-    enum: FieldTypes.STRING,
-    float: FieldTypes.NUMBER,
-    int: FieldTypes.NUMBER,
-    numeric: FieldTypes.NUMBER,
-    mediumint: FieldTypes.NUMBER,
-    dec: FieldTypes.NUMBER,
-    double: FieldTypes.NUMBER,
-    fixed: FieldTypes.NUMBER,
-    datetime: FieldTypes.DATETIME,
-    tinyint: FieldTypes.BOOLEAN,
-    long: FieldTypes.LONGFORM,
-    number: FieldTypes.NUMBER,
-    binary_float: FieldTypes.NUMBER,
-    binary_double: FieldTypes.NUMBER,
+    text: constants_1.FieldTypes.LONGFORM,
+    varchar: constants_1.FieldTypes.STRING,
+    integer: constants_1.FieldTypes.NUMBER,
+    bigint: constants_1.FieldTypes.NUMBER,
+    decimal: constants_1.FieldTypes.NUMBER,
+    smallint: constants_1.FieldTypes.NUMBER,
+    real: constants_1.FieldTypes.NUMBER,
+    "double precision": constants_1.FieldTypes.NUMBER,
+    timestamp: constants_1.FieldTypes.DATETIME,
+    time: constants_1.FieldTypes.DATETIME,
+    boolean: constants_1.FieldTypes.BOOLEAN,
+    json: constants_1.FieldTypes.JSON,
+    date: constants_1.FieldTypes.DATETIME,
+    blob: constants_1.FieldTypes.LONGFORM,
+    enum: constants_1.FieldTypes.STRING,
+    float: constants_1.FieldTypes.NUMBER,
+    int: constants_1.FieldTypes.NUMBER,
+    numeric: constants_1.FieldTypes.NUMBER,
+    mediumint: constants_1.FieldTypes.NUMBER,
+    dec: constants_1.FieldTypes.NUMBER,
+    double: constants_1.FieldTypes.NUMBER,
+    fixed: constants_1.FieldTypes.NUMBER,
+    datetime: constants_1.FieldTypes.DATETIME,
+    tinyint: constants_1.FieldTypes.BOOLEAN,
+    long: constants_1.FieldTypes.LONGFORM,
+    number: constants_1.FieldTypes.NUMBER,
+    binary_float: constants_1.FieldTypes.NUMBER,
+    binary_double: constants_1.FieldTypes.NUMBER,
 };
 var SqlClients;
 (function (SqlClients) {
@@ -44,7 +44,7 @@ var SqlClients;
     SqlClients["ORACLE"] = "oracledb";
 })(SqlClients = exports.SqlClients || (exports.SqlClients = {}));
 function isExternalTable(tableId) {
-    return tableId.includes(DocumentTypes.DATASOURCE);
+    return tableId.includes(utils_1.DocumentTypes.DATASOURCE);
 }
 exports.isExternalTable = isExternalTable;
 function buildExternalTableId(datasourceId, tableName) {
@@ -109,7 +109,7 @@ function convertSqlType(type) {
             return internal;
         }
     }
-    return FieldTypes.STRING;
+    return constants_1.FieldTypes.STRING;
 }
 exports.convertSqlType = convertSqlType;
 function getSqlQuery(query) {
@@ -148,7 +148,10 @@ function copyExistingPropsOver(tableName, table, entities) {
             if (!existingTableSchema.hasOwnProperty(key)) {
                 continue;
             }
-            if (existingTableSchema[key].type === "link") {
+            if (existingTableSchema[key].type === constants_1.FieldTypes.LINK ||
+                existingTableSchema[key].type === constants_1.FieldTypes.OPTIONS ||
+                ((!table.schema[key] || table.schema[key].type === constants_1.FieldTypes.NUMBER) &&
+                    existingTableSchema[key].type === constants_1.FieldTypes.BOOLEAN)) {
                 table.schema[key] = existingTableSchema[key];
             }
         }
@@ -156,18 +159,18 @@ function copyExistingPropsOver(tableName, table, entities) {
     return table;
 }
 function finaliseExternalTables(tables, entities) {
-    const invalidColumns = Object.values(InvalidColumns);
+    const invalidColumns = Object.values(constants_1.InvalidColumns);
     let finalTables = {};
     const errors = {};
     for (let [name, table] of Object.entries(tables)) {
         const schemaFields = Object.keys(table.schema);
         // make sure every table has a key
         if (table.primary == null || table.primary.length === 0) {
-            errors[name] = BuildSchemaErrors.NO_KEY;
+            errors[name] = constants_1.BuildSchemaErrors.NO_KEY;
             continue;
         }
         else if (schemaFields.find(field => invalidColumns.includes(field))) {
-            errors[name] = BuildSchemaErrors.INVALID_COLUMN;
+            errors[name] = constants_1.BuildSchemaErrors.INVALID_COLUMN;
             continue;
         }
         // make sure all previous props have been added back

package/dist/package.json

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