@budibase/server 2.1.43-alpha.0 → 2.1.43-alpha.10

package/dist/api/controllers/cloud.js

@@ -36,6 +36,7 @@ function createApp(appName, appDirectory) {
                 },
             },
         };
+        // @ts-ignore
         return (0, application_1.create)(ctx);
     });
 }

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

@@ -503,7 +503,8 @@ class ExternalRequest {
             for (let [colName, { isMany, rows, tableId }] of Object.entries(related)) {
                 const table = this.getTable(tableId);
                 // if its not the foreign key skip it, nothing to do
-                if (!table || (table.primary && table.primary.indexOf(colName) !== -1)) {
+                if (!table ||
+                    (!isMany && table.primary && table.primary.indexOf(colName) !== -1)) {
                     continue;
                 }
                 for (let row of rows) {

package/dist/api/controllers/user.js

@@ -8,58 +8,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getFlags = exports.setFlag = exports.findMetadata = exports.destroyMetadata = exports.updateMetadata = exports.updateSelfMetadata = exports.fetchMetadata = exports.syncUser = exports.syncGlobalUsers = void 0;
+exports.getFlags = exports.setFlag = exports.findMetadata = exports.destroyMetadata = exports.updateMetadata = exports.updateSelfMetadata = exports.fetchMetadata = exports.syncUser = void 0;
 const utils_1 = require("../../db/utils");
 const utils_2 = require("../../db/utils");
 const global_1 = require("../../utilities/global");
 const users_1 = require("../../utilities/users");
-const lodash_1 = require("lodash");
 const backend_core_1 = require("@budibase/backend-core");
-function rawMetadata() {
-    return __awaiter(this, void 0, void 0, function* () {
-        const db = backend_core_1.context.getAppDB();
-        return (yield db.allDocs((0, utils_1.getUserMetadataParams)(null, {
-            include_docs: true,
-        }))).rows.map(row => row.doc);
-    });
-}
-function combineMetadataAndUser(user, metadata) {
-    // skip users with no access
-    if (user.roleId === backend_core_1.roles.BUILTIN_ROLE_IDS.PUBLIC) {
-        return null;
-    }
-    delete user._rev;
-    const metadataId = (0, utils_1.generateUserMetadataID)(user._id);
-    const newDoc = Object.assign(Object.assign({}, user), { _id: metadataId, tableId: utils_2.InternalTables.USER_METADATA });
-    const found = Array.isArray(metadata)
-        ? metadata.find(doc => doc._id === metadataId)
-        : metadata;
-    // copy rev over for the purposes of equality check
-    if (found) {
-        newDoc._rev = found._rev;
-    }
-    if (found == null || !(0, lodash_1.isEqual)(newDoc, found)) {
-        return Object.assign(Object.assign({}, found), newDoc);
-    }
-    return null;
-}
-function syncGlobalUsers() {
-    return __awaiter(this, void 0, void 0, function* () {
-        // sync user metadata
-        const db = backend_core_1.context.getAppDB();
-        const [users, metadata] = yield Promise.all([(0, global_1.getGlobalUsers)(), rawMetadata()]);
-        const toWrite = [];
-        for (let user of users) {
-            const combined = yield combineMetadataAndUser(user, metadata);
-            if (combined) {
-                toWrite.push(combined);
-            }
-        }
-        yield db.bulkDocs(toWrite);
-    });
-}
-exports.syncGlobalUsers = syncGlobalUsers;
+const sdk_1 = __importDefault(require("../../sdk"));
 function syncUser(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         let deleting = false, user;
@@ -119,7 +78,7 @@ function syncUser(ctx) {
                         metadata.roleId = roleId;
                     }
                     let combined = !deleting
-                        ? combineMetadataAndUser(user, metadata)
+                        ? sdk_1.default.users.combineMetadataAndUser(user, metadata)
                         : Object.assign(Object.assign({}, metadata), { status: backend_core_1.constants.UserStatus.INACTIVE, metadata: backend_core_1.roles.BUILTIN_ROLE_IDS.PUBLIC });
                     // if its null then there was no updates required
                     if (combined) {
@@ -137,7 +96,7 @@ exports.syncUser = syncUser;
 function fetchMetadata(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const global = yield (0, global_1.getGlobalUsers)();
-        const metadata = yield rawMetadata();
+        const metadata = yield sdk_1.default.users.rawUserMetadata();
         const users = [];
         for (let user of global) {
             // find the metadata that matches up to the global ID

package/dist/integrations/base/types.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/integrations/microsoftSqlServer.js

@@ -195,15 +195,20 @@ class SqlServerIntegration extends sql_1.default {
                     .filter((constraint) => constraint.CONSTRAINT_TYPE === "PRIMARY KEY")
                     .map((constraint) => constraint.COLUMN_NAME);
                 const autoColumns = columns
-                    .filter((col) => col.IS_COMPUTED || col.IS_IDENTITY)
-                    .map((col) => col.COLUMN_NAME);
+                    .filter(col => col.IS_COMPUTED || col.IS_IDENTITY)
+                    .map(col => col.COLUMN_NAME);
+                const requiredColumns = columns
+                    .filter(col => col.IS_NULLABLE === "NO")
+                    .map(col => col.COLUMN_NAME);
                 let schema = {};
                 for (let def of definition) {
                     const name = def.COLUMN_NAME;
                     if (typeof name !== "string") {
                         continue;
                     }
-                    schema[name] = Object.assign(Object.assign({ autocolumn: !!autoColumns.find((col) => col === name), name: name }, (0, utils_1.convertSqlType)(def.DATA_TYPE)), { externalType: def.DATA_TYPE });
+                    schema[name] = Object.assign(Object.assign({ autocolumn: !!autoColumns.find(col => col === name), name: name, constraints: {
+                            presence: requiredColumns.find(col => col === name),
+                        } }, (0, utils_1.convertSqlType)(def.DATA_TYPE)), { externalType: def.DATA_TYPE });
                 }
                 tables[tableName] = {
                     _id: (0, utils_1.buildExternalTableId)(datasourceId, tableName),

package/dist/integrations/oracle.js

@@ -247,7 +247,9 @@ class OracleIntegration extends sql_1.default {
                     const columnName = oracleColumn.name;
                     let fieldSchema = table.schema[columnName];
                     if (!fieldSchema) {
-                        fieldSchema = Object.assign({ autocolumn: OracleIntegration.isAutoColumn(oracleColumn), name: columnName }, this.internalConvertType(oracleColumn));
+                        fieldSchema = Object.assign({ autocolumn: OracleIntegration.isAutoColumn(oracleColumn), name: columnName, constraints: {
+                                presence: false,
+                            } }, this.internalConvertType(oracleColumn));
                         table.schema[columnName] = fieldSchema;
                     }
                     // iterate each constraint on the column
@@ -255,6 +257,11 @@ class OracleIntegration extends sql_1.default {
                         if (oracleConstraint.type === OracleContraintTypes.PRIMARY) {
                             table.primary.push(columnName);
                         }
+                        else if (oracleConstraint.type === OracleContraintTypes.NOT_NULL_OR_CHECK) {
+                            table.schema[columnName].constraints = {
+                                presence: true,
+                            };
+                        }
                     });
                 });
             });

package/dist/integrations/postgres.js

@@ -15,8 +15,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const types_1 = require("@budibase/types");
 const utils_1 = require("./utils");
 const sql_1 = __importDefault(require("./base/sql"));
+const utilities_1 = require("../utilities");
 const { Client, types } = require("pg");
-const { escapeDangerousCharacters } = require("../utilities");
 // Return "date" and "timestamp" types as plain strings.
 // This lets us reference the original stored timezone.
 // types is undefined when running in a test env for some reason.
@@ -163,7 +163,7 @@ class PostgresIntegration extends sql_1.default {
                 const matches = query.sql.match(JSON_REGEX);
                 if (matches && matches.length > 0) {
                     for (let match of matches) {
-                        const escaped = escapeDangerousCharacters(match);
+                        const escaped = (0, utilities_1.escapeDangerousCharacters)(match);
                         query.sql = query.sql.replace(match, escaped);
                     }
                 }
@@ -227,11 +227,14 @@ class PostgresIntegration extends sql_1.default {
                     const identity = !!(column.identity_generation ||
                         column.identity_start ||
                         column.identity_increment);
+                    const constraints = {
+                        presence: column.is_nullable === "NO",
+                    };
                     const hasDefault = typeof column.column_default === "string" &&
                         column.column_default.startsWith("nextval");
                     const isGenerated = column.is_generated && column.is_generated !== "NEVER";
                     const isAuto = hasDefault || identity || isGenerated;
-                    tables[tableName].schema[columnName] = Object.assign(Object.assign({ autocolumn: isAuto, name: columnName }, (0, utils_1.convertSqlType)(column.data_type)), { externalType: column.data_type });
+                    tables[tableName].schema[columnName] = Object.assign(Object.assign({ autocolumn: isAuto, name: columnName, constraints }, (0, utils_1.convertSqlType)(column.data_type)), { externalType: column.data_type });
                 }
                 const final = (0, utils_1.finaliseExternalTables)(tables, entities);
                 this.tables = final.tables;

package/dist/migrations/functions/appUrls.js

@@ -8,10 +8,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.run = void 0;
 const backend_core_1 = require("@budibase/backend-core");
-const application_1 = require("../../api/controllers/application");
+const sdk_1 = __importDefault(require("../../sdk"));
 /**
  * Date:
  * January 2022
@@ -31,14 +34,7 @@ const run = (appDb) => __awaiter(void 0, void 0, void 0, function* () {
         return;
     }
     if (!metadata.url) {
-        const context = {
-            request: {
-                body: {
-                    name: metadata.name,
-                },
-            },
-        };
-        metadata.url = (0, application_1.getAppUrl)(context);
+        metadata.url = sdk_1.default.applications.getAppUrl({ name: metadata.name });
         console.log(`Adding url to app: ${metadata.url}`);
         yield appDb.put(metadata);
     }

package/dist/package.json

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

package/dist/sdk/app/applications/index.js

@@ -0,0 +1,28 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const sync = __importStar(require("./sync"));
+const utils = __importStar(require("./utils"));
+exports.default = Object.assign(Object.assign({}, sync), utils);

package/dist/sdk/app/applications/sync.js

@@ -0,0 +1,66 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.syncApp = void 0;
+const environment_1 = __importDefault(require("../../../environment"));
+const backend_core_1 = require("@budibase/backend-core");
+const __1 = __importDefault(require("../../"));
+function syncApp(appId) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (environment_1.default.DISABLE_AUTO_PROD_APP_SYNC) {
+            return {
+                message: "App sync disabled. You can reenable with the DISABLE_AUTO_PROD_APP_SYNC environment variable.",
+            };
+        }
+        if (backend_core_1.db.isProdAppID(appId)) {
+            throw new Error("This action cannot be performed for production apps");
+        }
+        // replicate prod to dev
+        const prodAppId = backend_core_1.db.getProdAppID(appId);
+        // specific case, want to make sure setup is skipped
+        const prodDb = backend_core_1.context.getProdAppDB({ skip_setup: true });
+        const exists = yield prodDb.exists();
+        if (!exists) {
+            // the database doesn't exist. Don't replicate
+            return {
+                message: "App sync not required, app not deployed.",
+            };
+        }
+        const replication = new backend_core_1.db.Replication({
+            source: prodAppId,
+            target: appId,
+        });
+        let error;
+        try {
+            yield replication.replicate(replication.appReplicateOpts());
+        }
+        catch (err) {
+            error = err;
+        }
+        finally {
+            yield replication.close();
+        }
+        // sync the users
+        yield __1.default.users.syncGlobalUsers();
+        if (error) {
+            throw error;
+        }
+        else {
+            return {
+                message: "App sync completed successfully.",
+            };
+        }
+    });
+}
+exports.syncApp = syncApp;

package/dist/sdk/app/applications/utils.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getAppUrl = void 0;
+const URL_REGEX_SLASH = /\/|\\/g;
+function getAppUrl(opts) {
+    // construct the url
+    let url;
+    if (opts === null || opts === void 0 ? void 0 : opts.url) {
+        // if the url is provided, use that
+        url = encodeURI(opts === null || opts === void 0 ? void 0 : opts.url);
+    }
+    else if (opts === null || opts === void 0 ? void 0 : opts.name) {
+        // otherwise use the name
+        url = encodeURI(`${opts === null || opts === void 0 ? void 0 : opts.name}`);
+    }
+    if (url) {
+        url = `/${url.replace(URL_REGEX_SLASH, "")}`.toLowerCase();
+    }
+    return url;
+}
+exports.getAppUrl = getAppUrl;

package/dist/sdk/index.js

@@ -6,12 +6,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const backups_1 = __importDefault(require("./app/backups"));
 const tables_1 = __importDefault(require("./app/tables"));
 const automations_1 = __importDefault(require("./app/automations"));
+const applications_1 = __importDefault(require("./app/applications"));
+const users_1 = __importDefault(require("./users"));
 const sdk = {
     backups: backups_1.default,
     tables: tables_1.default,
     automations: automations_1.default,
+    applications: applications_1.default,
+    users: users_1.default,
 };
 // default export for TS
 exports.default = sdk;
-// default export for JS
-module.exports = sdk;

package/dist/sdk/users/index.js

@@ -0,0 +1,27 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const utils = __importStar(require("./utils"));
+exports.default = Object.assign({}, utils);

package/dist/sdk/users/utils.js

@@ -0,0 +1,65 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.syncGlobalUsers = exports.rawUserMetadata = exports.combineMetadataAndUser = void 0;
+const global_1 = require("../../utilities/global");
+const backend_core_1 = require("@budibase/backend-core");
+const utils_1 = require("../../db/utils");
+const lodash_1 = require("lodash");
+function combineMetadataAndUser(user, metadata) {
+    // skip users with no access
+    if (user.roleId === backend_core_1.roles.BUILTIN_ROLE_IDS.PUBLIC) {
+        return null;
+    }
+    delete user._rev;
+    const metadataId = (0, utils_1.generateUserMetadataID)(user._id);
+    const newDoc = Object.assign(Object.assign({}, user), { _id: metadataId, tableId: utils_1.InternalTables.USER_METADATA });
+    const found = Array.isArray(metadata)
+        ? metadata.find(doc => doc._id === metadataId)
+        : metadata;
+    // copy rev over for the purposes of equality check
+    if (found) {
+        newDoc._rev = found._rev;
+    }
+    if (found == null || !(0, lodash_1.isEqual)(newDoc, found)) {
+        return Object.assign(Object.assign({}, found), newDoc);
+    }
+    return null;
+}
+exports.combineMetadataAndUser = combineMetadataAndUser;
+function rawUserMetadata() {
+    return __awaiter(this, void 0, void 0, function* () {
+        const db = backend_core_1.context.getAppDB();
+        return (yield db.allDocs((0, utils_1.getUserMetadataParams)(null, {
+            include_docs: true,
+        }))).rows.map(row => row.doc);
+    });
+}
+exports.rawUserMetadata = rawUserMetadata;
+function syncGlobalUsers() {
+    return __awaiter(this, void 0, void 0, function* () {
+        // sync user metadata
+        const db = backend_core_1.context.getAppDB();
+        const [users, metadata] = yield Promise.all([
+            (0, global_1.getGlobalUsers)(),
+            rawUserMetadata(),
+        ]);
+        const toWrite = [];
+        for (let user of users) {
+            const combined = yield combineMetadataAndUser(user, metadata);
+            if (combined) {
+                toWrite.push(combined);
+            }
+        }
+        yield db.bulkDocs(toWrite);
+    });
+}
+exports.syncGlobalUsers = syncGlobalUsers;