@budibase/server 0.9.185-alpha.12 → 0.9.185-alpha.13

package/coverage/lcov-report/threads/query.js.html

@@ -253,7 +253,7 @@ module.exports = (input, callback) => {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Mon Nov 22 2021 10:51:12 GMT+0000 (Coordinated Universal Time)
+                at Mon Nov 22 2021 11:11:02 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

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

@@ -109,7 +109,7 @@ const SALT_ROUNDS = <span class="cstat-no" title="statement not covered" >env.SA
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Mon Nov 22 2021 10:51:12 GMT+0000 (Coordinated Universal Time)
+                at Mon Nov 22 2021 11:11:02 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

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

@@ -94,7 +94,7 @@ module.exports.budibaseTempDir = budibaseTempDir
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Mon Nov 22 2021 10:51:12 GMT+0000 (Coordinated Universal Time)
+                at Mon Nov 22 2021 11:11:02 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

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

@@ -130,7 +130,7 @@ exports.resolve = <span class="fstat-no" title="function not covered" >fu</span>
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Mon Nov 22 2021 10:51:12 GMT+0000 (Coordinated Universal Time)
+                at Mon Nov 22 2021 11:11:02 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

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

@@ -487,7 +487,7 @@ module.exports = {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Mon Nov 22 2021 10:51:12 GMT+0000 (Coordinated Universal Time)
+                at Mon Nov 22 2021 11:11:02 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

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

@@ -367,7 +367,7 @@ exports.getGlobalUsersFromMetadata = async (appId, users) => {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Mon Nov 22 2021 10:51:12 GMT+0000 (Coordinated Universal Time)
+                at Mon Nov 22 2021 11:11:02 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

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

@@ -245,7 +245,7 @@
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Mon Nov 22 2021 10:51:12 GMT+0000 (Coordinated Universal Time)
+                at Mon Nov 22 2021 11:11:02 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

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

@@ -520,7 +520,7 @@ exports.doesDatabaseExist = <span class="fstat-no" title="function not covered"
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Mon Nov 22 2021 10:51:12 GMT+0000 (Coordinated Universal Time)
+                at Mon Nov 22 2021 11:11:02 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

package/coverage/lcov-report/utilities/queue/inMemoryQueue.js.html

@@ -367,7 +367,7 @@ module.exports = InMemoryQueue
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Mon Nov 22 2021 10:51:12 GMT+0000 (Coordinated Universal Time)
+                at Mon Nov 22 2021 11:11:02 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

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

@@ -95,7 +95,7 @@
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Mon Nov 22 2021 10:51:12 GMT+0000 (Coordinated Universal Time)
+                at Mon Nov 22 2021 11:11:02 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

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

@@ -95,7 +95,7 @@
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Mon Nov 22 2021 10:51:12 GMT+0000 (Coordinated Universal Time)
+                at Mon Nov 22 2021 11:11:02 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

package/coverage/lcov-report/utilities/routing/index.js.html

@@ -139,7 +139,7 @@ exports.createRoutingView = createRoutingView
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Mon Nov 22 2021 10:51:12 GMT+0000 (Coordinated Universal Time)
+                at Mon Nov 22 2021 11:11:02 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

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

@@ -110,7 +110,7 @@
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Mon Nov 22 2021 10:51:12 GMT+0000 (Coordinated Universal Time)
+                at Mon Nov 22 2021 11:11:02 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

package/coverage/lcov-report/utilities/rowProcessor/index.js.html

@@ -850,7 +850,7 @@ exports.outputProcessing = async (
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Mon Nov 22 2021 10:51:12 GMT+0000 (Coordinated Universal Time)
+                at Mon Nov 22 2021 11:11:02 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

package/coverage/lcov-report/utilities/rowProcessor/utils.js.html

@@ -133,7 +133,7 @@ exports.processFormulas = (table, rows) => {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Mon Nov 22 2021 10:51:12 GMT+0000 (Coordinated Universal Time)
+                at Mon Nov 22 2021 11:11:02 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

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

@@ -136,7 +136,7 @@ module.exports = ScriptRunner
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Mon Nov 22 2021 10:51:12 GMT+0000 (Coordinated Universal Time)
+                at Mon Nov 22 2021 11:11:02 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

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

@@ -265,7 +265,7 @@ exports.CURRENTLY_SUPPORTED_LEVELS = CURRENTLY_SUPPORTED_LEVELS
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Mon Nov 22 2021 10:51:12 GMT+0000 (Coordinated Universal Time)
+                at Mon Nov 22 2021 11:11:02 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

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

@@ -85,7 +85,7 @@
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Mon Nov 22 2021 10:51:12 GMT+0000 (Coordinated Universal Time)
+                at Mon Nov 22 2021 11:11:02 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

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

@@ -136,7 +136,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">istanbul</a>
-                at Mon Nov 22 2021 10:51:12 GMT+0000 (Coordinated Universal Time)
+                at Mon Nov 22 2021 11:11:02 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

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 Mon Nov 22 2021 10:51:12 GMT+0000 (Coordinated Universal Time)
+                at Mon Nov 22 2021 11:11:02 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

package/coverage/lcov.info

@@ -817,11 +817,13 @@ FN:118,(anonymous_6)
 FN:126,(anonymous_7)
 FN:140,(anonymous_8)
 FN:146,(anonymous_9)
-FN:155,(anonymous_10)
-FN:169,(anonymous_11)
-FN:180,(anonymous_12)
-FN:181,(anonymous_13)
-FNF:14
+FN:155,getErrorTables
+FN:157,(anonymous_11)
+FN:158,(anonymous_12)
+FN:161,updateError
+FN:172,(anonymous_14)
+FN:186,(anonymous_15)
+FNF:16
 FNH:8
 FNDA:2,(anonymous_0)
 FNDA:2,(anonymous_1)
@@ -833,10 +835,12 @@ FNDA:1,(anonymous_6)
 FNDA:1,(anonymous_7)
 FNDA:1,(anonymous_8)
 FNDA:1,(anonymous_9)
-FNDA:0,(anonymous_10)
+FNDA:0,getErrorTables
 FNDA:0,(anonymous_11)
 FNDA:0,(anonymous_12)
-FNDA:0,(anonymous_13)
+FNDA:0,updateError
+FNDA:0,(anonymous_14)
+FNDA:0,(anonymous_15)
 DA:1,33
 DA:9,33
 DA:10,33
@@ -912,27 +916,39 @@ DA:147,1
 DA:148,1
 DA:149,1
 DA:151,0
-DA:155,33
 DA:156,0
-DA:159,0
-DA:160,0
-DA:161,0
-DA:164,0
+DA:157,0
+DA:158,0
+DA:162,0
+DA:163,0
 DA:165,0
 DA:166,0
 DA:168,0
 DA:169,0
-DA:171,0
-DA:172,0
+DA:172,33
+DA:173,0
 DA:176,0
 DA:177,0
 DA:178,0
-DA:179,0
-DA:180,0
 DA:181,0
 DA:182,0
+DA:183,0
+DA:185,0
 DA:186,0
-LF:95
+DA:188,0
+DA:189,0
+DA:193,0
+DA:194,0
+DA:195,0
+DA:196,0
+DA:197,0
+DA:198,0
+DA:199,0
+DA:205,0
+DA:206,0
+DA:207,0
+DA:214,0
+LF:107
 LH:47
 BRDA:54,0,0,0
 BRDA:54,0,1,0
@@ -954,15 +970,23 @@ BRDA:106,8,0,23
 BRDA:106,8,1,21
 BRDA:112,9,0,0
 BRDA:112,9,1,23
-BRDA:165,10,0,0
-BRDA:165,10,1,0
-BRDA:171,11,0,0
-BRDA:171,11,1,0
-BRDA:178,12,0,0
-BRDA:178,12,1,0
-BRDA:178,13,0,0
-BRDA:178,13,1,0
-BRF:28
+BRDA:162,10,0,0
+BRDA:162,10,1,0
+BRDA:165,11,0,0
+BRDA:165,11,1,0
+BRDA:182,12,0,0
+BRDA:182,12,1,0
+BRDA:188,13,0,0
+BRDA:188,13,1,0
+BRDA:195,14,0,0
+BRDA:195,14,1,0
+BRDA:195,15,0,0
+BRDA:195,15,1,0
+BRDA:198,16,0,0
+BRDA:198,16,1,0
+BRDA:205,17,0,0
+BRDA:205,17,1,0
+BRF:36
 BRH:7
 end_of_record
 TN:
@@ -5766,9 +5790,10 @@ DA:153,40
 DA:154,40
 DA:161,40
 DA:166,40
-DA:171,40
-LF:20
-LH:20
+DA:172,40
+DA:178,40
+LF:21
+LH:21
 BRF:0
 BRH:0
 end_of_record

package/dist/api/controllers/datasource.js

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 const CouchDB = require("../../db");
 const { generateDatasourceID, getDatasourceParams, getQueryParams, DocumentTypes, BudibaseInternalDB, getTableParams, } = require("../../db/utils");
-const { BuildSchemaErrors } = require("../../constants");
+const { BuildSchemaErrors, InvalidColumns } = require("../../constants");
 const { integrations } = require("../../integrations");
 const { getDatasourceAndQuery } = require("./row/utils");
 exports.fetch = function (ctx) {
@@ -127,6 +127,21 @@ exports.query = function (ctx) {
         }
     });
 };
+function getErrorTables(errors, errorType) {
+    return Object.entries(errors)
+        .filter(entry => entry[1] === errorType)
+        .map(([name]) => name);
+}
+function updateError(error, newError, tables) {
+    if (!error) {
+        error = "";
+    }
+    if (error.length > 0) {
+        error += "\n";
+    }
+    error += `${newError} ${tables.join(", ")}`;
+    return error;
+}
 const buildSchemaHelper = (datasource) => __awaiter(void 0, void 0, void 0, function* () {
     const Connector = integrations[datasource.source];
     // Connect to the DB and build the schema
@@ -146,10 +161,15 @@ const buildSchemaHelper = (datasource) => __awaiter(void 0, void 0, void 0, func
     const errors = connector.schemaErrors;
     let error = null;
     if (errors && Object.keys(errors).length > 0) {
-        const noKeyTables = Object.entries(errors)
-            .filter(entry => entry[1] === BuildSchemaErrors.NO_KEY)
-            .map(([name]) => name);
-        error = `No primary key constraint found for the following: ${noKeyTables.join(", ")}`;
+        const noKey = getErrorTables(errors, BuildSchemaErrors.NO_KEY);
+        const invalidCol = getErrorTables(errors, BuildSchemaErrors.INVALID_COLUMN);
+        if (noKey.length) {
+            error = updateError(error, "No primary key constraint found for the following:", noKey);
+        }
+        if (invalidCol.length) {
+            const invalidCols = Object.values(InvalidColumns).join(", ");
+            error = updateError(error, `Cannot use columns ${invalidCols} found in following:`, invalidCol);
+        }
     }
     return { tables: connector.tables, error };
 });

package/dist/constants/index.js

@@ -150,8 +150,14 @@ exports.MetadataTypes = {
     AUTOMATION_TEST_INPUT: "automationTestInput",
     AUTOMATION_TEST_HISTORY: "automationTestHistory",
 };
+exports.InvalidColumns = {
+    ID: "_id",
+    REV: "_rev",
+    TABLE_ID: "tableId",
+};
 exports.BuildSchemaErrors = {
     NO_KEY: "no_key",
+    INVALID_COLUMN: "invalid_column",
 };
 // pass through the list from the auth/core lib
 exports.ObjectStoreBuckets = ObjectStoreBuckets;

package/dist/integrations/utils.js

@@ -3,7 +3,7 @@ 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 } = require("../constants");
+const { FieldTypes, BuildSchemaErrors, InvalidColumns } = require("../constants");
 const DOUBLE_SEPARATOR = `${SEPARATOR}${SEPARATOR}`;
 const ROW_ID_REGEX = /^\[.*]$/g;
 const SQL_TYPE_MAP = {
@@ -151,14 +151,20 @@ function copyExistingPropsOver(tableName, table, entities) {
     return table;
 }
 function finaliseExternalTables(tables, entities) {
+    const invalidColumns = Object.values(InvalidColumns);
     const 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;
             continue;
         }
+        else if (schemaFields.find(field => invalidColumns.includes(field))) {
+            errors[name] = BuildSchemaErrors.INVALID_COLUMN;
+            continue;
+        }
         // make sure all previous props have been added back
         finalTables[name] = copyExistingPropsOver(name, table, entities);
     }

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "0.9.185-alpha.11",
+    "version": "0.9.185-alpha.12",
     "description": "Budibase Web Server",
     "main": "src/index.js",
     "repository": {
@@ -68,9 +68,9 @@
     "author": "Budibase",
     "license": "AGPL-3.0-or-later",
     "dependencies": {
-        "@budibase/auth": "^0.9.185-alpha.11",
-        "@budibase/client": "^0.9.185-alpha.11",
-        "@budibase/string-templates": "^0.9.185-alpha.11",
+        "@budibase/auth": "^0.9.185-alpha.12",
+        "@budibase/client": "^0.9.185-alpha.12",
+        "@budibase/string-templates": "^0.9.185-alpha.12",
         "@bull-board/api": "^3.7.0",
         "@bull-board/koa": "^3.7.0",
         "@elastic/elasticsearch": "7.10.0",