@budibase/server 2.5.9 → 2.5.10-alpha.0

package/dist/utilities/fileSystem/plugin.js

@@ -12,12 +12,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDatasourcePlugin = exports.getPluginMetadata = void 0;
+exports.getAutomationPlugin = exports.getDatasourcePlugin = exports.getPluginMetadata = void 0;
 const budibaseDir_1 = require("../budibaseDir");
 const fs_1 = __importDefault(require("fs"));
 const path_1 = require("path");
 const backend_core_1 = require("@budibase/backend-core");
 const DATASOURCE_PATH = (0, path_1.join)((0, budibaseDir_1.budibaseTempDir)(), "datasource");
+const AUTOMATION_PATH = (0, path_1.join)((0, budibaseDir_1.budibaseTempDir)(), "automation");
 const getPluginMetadata = (path) => __awaiter(void 0, void 0, void 0, function* () {
     let metadata = {};
     try {
@@ -37,30 +38,39 @@ const getPluginMetadata = (path) => __awaiter(void 0, void 0, void 0, function*
     return { metadata, directory: path };
 });
 exports.getPluginMetadata = getPluginMetadata;
-const getDatasourcePlugin = (plugin) => __awaiter(void 0, void 0, void 0, function* () {
+function getPluginImpl(path, plugin) {
     var _a;
-    const hash = (_a = plugin.schema) === null || _a === void 0 ? void 0 : _a.hash;
-    if (!fs_1.default.existsSync(DATASOURCE_PATH)) {
-        fs_1.default.mkdirSync(DATASOURCE_PATH);
-    }
-    const filename = (0, path_1.join)(DATASOURCE_PATH, plugin.name);
-    const metadataName = `${filename}.bbmetadata`;
-    if (fs_1.default.existsSync(filename)) {
-        const currentHash = fs_1.default.readFileSync(metadataName, "utf8");
-        // if hash is the same return the file, otherwise remove it and re-download
-        if (currentHash === hash) {
-            return require(filename);
+    return __awaiter(this, void 0, void 0, function* () {
+        const hash = (_a = plugin.schema) === null || _a === void 0 ? void 0 : _a.hash;
+        if (!fs_1.default.existsSync(path)) {
+            fs_1.default.mkdirSync(path);
         }
-        else {
-            console.log(`Updating plugin: ${plugin.name}`);
-            delete require.cache[require.resolve(filename)];
-            fs_1.default.unlinkSync(filename);
+        const filename = (0, path_1.join)(path, plugin.name);
+        const metadataName = `${filename}.bbmetadata`;
+        if (fs_1.default.existsSync(filename)) {
+            const currentHash = fs_1.default.readFileSync(metadataName, "utf8");
+            // if hash is the same return the file, otherwise remove it and re-download
+            if (currentHash === hash) {
+                return require(filename);
+            }
+            else {
+                console.log(`Updating plugin: ${plugin.name}`);
+                delete require.cache[require.resolve(filename)];
+                fs_1.default.unlinkSync(filename);
+            }
         }
-    }
-    const pluginKey = backend_core_1.objectStore.getPluginJSKey(plugin);
-    const pluginJs = yield backend_core_1.objectStore.retrieve(backend_core_1.objectStore.ObjectStoreBuckets.PLUGINS, pluginKey);
-    fs_1.default.writeFileSync(filename, pluginJs);
-    fs_1.default.writeFileSync(metadataName, hash);
-    return require(filename);
+        const pluginKey = backend_core_1.objectStore.getPluginJSKey(plugin);
+        const pluginJs = yield backend_core_1.objectStore.retrieve(backend_core_1.objectStore.ObjectStoreBuckets.PLUGINS, pluginKey);
+        fs_1.default.writeFileSync(filename, pluginJs);
+        fs_1.default.writeFileSync(metadataName, hash);
+        return require(filename);
+    });
+}
+const getDatasourcePlugin = (plugin) => __awaiter(void 0, void 0, void 0, function* () {
+    return getPluginImpl(DATASOURCE_PATH, plugin);
 });
 exports.getDatasourcePlugin = getDatasourcePlugin;
+const getAutomationPlugin = (plugin) => __awaiter(void 0, void 0, void 0, function* () {
+    return getPluginImpl(AUTOMATION_PATH, plugin);
+});
+exports.getAutomationPlugin = getAutomationPlugin;

package/dist/utilities/global.js

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getGlobalUsersFromMetadata = exports.getGlobalUsers = exports.getGlobalUser = exports.getRawGlobalUser = exports.getCachedSelf = exports.updateAppRole = void 0;
+exports.getGlobalUsersFromMetadata = exports.getGlobalUsers = exports.getGlobalUser = exports.getRawGlobalUser = exports.getCachedSelf = exports.processUser = exports.updateAppRole = void 0;
 const utils_1 = require("../db/utils");
 const backend_core_1 = require("@budibase/backend-core");
 const environment_1 = __importDefault(require("../environment"));
@@ -20,7 +20,7 @@ const pro_1 = require("@budibase/pro");
 function updateAppRole(user, { appId } = {}) {
     var _a;
     appId = appId || backend_core_1.context.getAppId();
-    if (!user || !user.roles) {
+    if (!user || (!user.roles && !user.userGroups)) {
         return user;
     }
     // if in an multi-tenancy environment make sure roles are never updated
@@ -31,7 +31,7 @@ function updateAppRole(user, { appId } = {}) {
         return user;
     }
     // always use the deployed app
-    if (appId) {
+    if (appId && user.roles) {
         user.roleId = user.roles[backend_core_1.db.getProdAppID(appId)];
     }
     // if a role wasn't found then either set as admin (builder) or public (everyone else)
@@ -76,6 +76,7 @@ function processUser(user, opts = {}) {
         return user;
     });
 }
+exports.processUser = processUser;
 function getCachedSelf(ctx, appId) {
     var _a;
     return __awaiter(this, void 0, void 0, function* () {
@@ -101,15 +102,13 @@ function getGlobalUser(userId) {
     });
 }
 exports.getGlobalUser = getGlobalUser;
-function getGlobalUsers(users) {
+function getGlobalUsers(userIds, opts) {
     return __awaiter(this, void 0, void 0, function* () {
         const appId = backend_core_1.context.getAppId();
         const db = backend_core_1.tenancy.getGlobalDB();
-        const allGroups = yield pro_1.groups.fetch();
         let globalUsers;
-        if (users) {
-            const globalIds = users.map(user => (0, utils_1.getGlobalIDFromUserMetadataID)(user._id));
-            globalUsers = (yield db.allDocs((0, utils_1.getMultiIDParams)(globalIds))).rows.map(row => row.doc);
+        if (userIds) {
+            globalUsers = (yield db.allDocs((0, utils_1.getMultiIDParams)(userIds))).rows.map(row => row.doc);
         }
         else {
             globalUsers = (yield db.allDocs(backend_core_1.db.getGlobalUserParams(null, {
@@ -126,15 +125,21 @@ function getGlobalUsers(users) {
         if (!appId) {
             return globalUsers;
         }
-        // pass in the groups, meaning we don't actually need to retrieve them for
-        // each user individually
-        return Promise.all(globalUsers.map(user => processUser(user, { groups: allGroups })));
+        if (opts === null || opts === void 0 ? void 0 : opts.noProcessing) {
+            return globalUsers;
+        }
+        else {
+            // pass in the groups, meaning we don't actually need to retrieve them for
+            // each user individually
+            const allGroups = yield pro_1.groups.fetch();
+            return Promise.all(globalUsers.map(user => processUser(user, { groups: allGroups })));
+        }
     });
 }
 exports.getGlobalUsers = getGlobalUsers;
 function getGlobalUsersFromMetadata(users) {
     return __awaiter(this, void 0, void 0, function* () {
-        const globalUsers = yield getGlobalUsers(users);
+        const globalUsers = yield getGlobalUsers(users.map(user => user._id));
         return users.map(user => {
             const globalUser = globalUsers.find(globalUser => { var _a; return globalUser && ((_a = user._id) === null || _a === void 0 ? void 0 : _a.includes(globalUser._id)); });
             return Object.assign(Object.assign({}, globalUser), user);

package/dist/utilities/rowProcessor/utils.js

@@ -46,17 +46,16 @@ function processFormulas(table, rows, { dynamic, contextRows } = { dynamic: true
     for (let [column, schema] of Object.entries(table.schema)) {
         const isStatic = schema.formulaType === constants_1.FormulaTypes.STATIC;
         if (schema.type !== constants_1.FieldTypes.FORMULA ||
+            schema.formula == null ||
             (dynamic && isStatic) ||
             (!dynamic && !isStatic)) {
             continue;
         }
         // iterate through rows and process formula
         for (let i = 0; i < rowArray.length; i++) {
-            if (schema.formula) {
-                let row = rowArray[i];
-                let context = contextRows ? contextRows[i] : row;
-                rowArray[i] = Object.assign(Object.assign({}, row), { [column]: (0, string_templates_1.processStringSync)(schema.formula, context) });
-            }
+            let row = rowArray[i];
+            let context = contextRows ? contextRows[i] : row;
+            rowArray[i] = Object.assign(Object.assign({}, row), { [column]: (0, string_templates_1.processStringSync)(schema.formula, context) });
         }
     }
     return single ? rowArray[0] : rowArray;

package/dist/watch.js

@@ -18,7 +18,7 @@ const environment_1 = __importDefault(require("./environment"));
 const chokidar_1 = __importDefault(require("chokidar"));
 const fs_1 = __importDefault(require("fs"));
 const backend_core_1 = require("@budibase/backend-core");
-const plugin_1 = require("./api/controllers/plugin");
+const plugins_1 = __importDefault(require("./sdk/plugins"));
 function watch() {
     const watchPath = path_1.default.join(environment_1.default.PLUGINS_DIR, "./**/*.tar.gz");
     chokidar_1.default
@@ -41,7 +41,7 @@ function watch() {
                 const split = path.split("/");
                 const name = split[split.length - 1];
                 console.log("Importing plugin:", path);
-                yield (0, plugin_1.processUploadedPlugin)({ name, path });
+                yield plugins_1.default.processUploaded({ name, path });
             }
             catch (err) {
                 const message = (err === null || err === void 0 ? void 0 : err.message) ? err === null || err === void 0 ? void 0 : err.message : err;

package/dist/websockets/client.js

@@ -0,0 +1,14 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const websocket_1 = __importDefault(require("./websocket"));
+const authorized_1 = __importDefault(require("../middleware/authorized"));
+const backend_core_1 = require("@budibase/backend-core");
+class ClientAppWebsocket extends websocket_1.default {
+    constructor(app, server) {
+        super(app, server, "/socket/client", [(0, authorized_1.default)(backend_core_1.permissions.BUILDER)]);
+    }
+}
+exports.default = ClientAppWebsocket;

package/dist/websockets/grid.js

@@ -0,0 +1,60 @@
+"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 });
+const authorized_1 = __importDefault(require("../middleware/authorized"));
+const websocket_1 = __importDefault(require("./websocket"));
+const backend_core_1 = require("@budibase/backend-core");
+class GridSocket extends websocket_1.default {
+    constructor(app, server) {
+        super(app, server, "/socket/grid", [(0, authorized_1.default)(backend_core_1.permissions.BUILDER)]);
+        this.io.on("connection", socket => {
+            const user = socket.data.user;
+            console.log(`Spreadsheet user connected: ${user === null || user === void 0 ? void 0 : user.id}`);
+            // Socket state
+            let currentRoom;
+            // Initial identification of connected spreadsheet
+            socket.on("select-table", (tableId, callback) => __awaiter(this, void 0, void 0, function* () {
+                // Leave current room
+                if (currentRoom) {
+                    socket.to(currentRoom).emit("user-disconnect", socket.data.user);
+                    socket.leave(currentRoom);
+                }
+                // Join new room
+                currentRoom = tableId;
+                socket.join(currentRoom);
+                socket.to(currentRoom).emit("user-update", socket.data.user);
+                // Reply with all users in current room
+                const sockets = yield this.io.in(currentRoom).fetchSockets();
+                callback({
+                    users: sockets.map(socket => socket.data.user),
+                    id: user.id,
+                });
+            }));
+            // Handle users selecting a new cell
+            socket.on("select-cell", cellId => {
+                socket.data.user.selectedCellId = cellId;
+                if (currentRoom) {
+                    socket.to(currentRoom).emit("user-update", socket.data.user);
+                }
+            });
+            // Disconnection cleanup
+            socket.on("disconnect", () => {
+                if (currentRoom) {
+                    socket.to(currentRoom).emit("user-disconnect", socket.data.user);
+                }
+            });
+        });
+    }
+}
+exports.default = GridSocket;

package/dist/websockets/index.js

@@ -0,0 +1,17 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.gridSocket = exports.clientAppSocket = exports.initialise = void 0;
+const grid_1 = __importDefault(require("./grid"));
+const client_1 = __importDefault(require("./client"));
+let clientAppSocket;
+exports.clientAppSocket = clientAppSocket;
+let gridSocket;
+exports.gridSocket = gridSocket;
+const initialise = (app, server) => {
+    exports.clientAppSocket = clientAppSocket = new client_1.default(app, server);
+    exports.gridSocket = gridSocket = new grid_1.default(app, server);
+};
+exports.initialise = initialise;

package/dist/websockets/websocket.js

@@ -0,0 +1,78 @@
+"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 });
+const socket_io_1 = require("socket.io");
+const http_1 = __importDefault(require("http"));
+const cookies_1 = __importDefault(require("cookies"));
+const koa_useragent_1 = require("koa-useragent");
+const backend_core_1 = require("@budibase/backend-core");
+const currentapp_1 = __importDefault(require("../middleware/currentapp"));
+class Socket {
+    constructor(app, server, path, additionalMiddlewares) {
+        this.io = new socket_io_1.Server(server, {
+            path,
+        });
+        // Attach default middlewares
+        const authenticate = backend_core_1.auth.buildAuthMiddleware([], {
+            publicAllowed: true,
+        });
+        const middlewares = [
+            koa_useragent_1.userAgent,
+            authenticate,
+            currentapp_1.default,
+            ...(additionalMiddlewares || []),
+        ];
+        // Apply middlewares
+        this.io.use((socket, next) => __awaiter(this, void 0, void 0, function* () {
+            // Build fake koa context
+            const res = new http_1.default.ServerResponse(socket.request);
+            const ctx = Object.assign(Object.assign({}, app.createContext(socket.request, res)), { 
+                // Additional overrides needed to make our middlewares work with this
+                // fake koa context
+                cookies: new cookies_1.default(socket.request, res), get: (field) => socket.request.headers[field], throw: (code, message) => {
+                    throw new Error(message);
+                }, 
+                // Needed for koa-useragent middleware
+                headers: socket.request.headers, header: socket.request.headers, 
+                // We don't really care about the path since it will never contain
+                // an app ID
+                path: "/socket" });
+            // Run all koa middlewares
+            try {
+                for (let [idx, middleware] of middlewares.entries()) {
+                    yield middleware(ctx, () => {
+                        if (idx === middlewares.length - 1) {
+                            // Middlewares are finished.
+                            // Extract some data from our enriched koa context to persist
+                            // as metadata for the socket
+                            socket.data.user = {
+                                id: ctx.user._id,
+                                email: ctx.user.email,
+                            };
+                            next();
+                        }
+                    });
+                }
+            }
+            catch (error) {
+                next(error);
+            }
+        }));
+    }
+    // Emit an event to all sockets
+    emit(event, payload) {
+        this.io.sockets.emit(event, payload);
+    }
+}
+exports.default = Socket;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.5.9",
+  "version": "2.5.10-alpha.0",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -26,6 +26,7 @@
     "dev:stack:down": "node scripts/dev/manage.js down",
     "dev:stack:nuke": "node scripts/dev/manage.js nuke",
     "dev:builder": "yarn run dev:stack:up && nodemon",
+    "dev:built": "yarn run dev:stack:up && yarn run run:docker",
     "specs": "ts-node specs/generate.ts && openapi-typescript specs/openapi.yaml --output src/definitions/openapi.ts",
     "initialise": "node scripts/initialise.js",
     "env:multi:enable": "node scripts/multiTenancy.js enable",
@@ -44,12 +45,12 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "^2.5.9",
-    "@budibase/client": "^2.5.9",
-    "@budibase/pro": "2.5.8",
-    "@budibase/shared-core": "^2.5.9",
-    "@budibase/string-templates": "^2.5.9",
-    "@budibase/types": "^2.5.9",
+    "@budibase/backend-core": "2.5.10-alpha.0",
+    "@budibase/client": "2.5.10-alpha.0",
+    "@budibase/pro": "2.5.9",
+    "@budibase/shared-core": "2.5.10-alpha.0",
+    "@budibase/string-templates": "2.5.10-alpha.0",
+    "@budibase/types": "2.5.10-alpha.0",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
@@ -64,6 +65,7 @@
     "bull": "4.10.1",
     "chmodr": "1.2.0",
     "chokidar": "3.5.3",
+    "cookies": "0.8.0",
     "csvtojson": "2.0.10",
     "curlconverter": "3.21.0",
     "dd-trace": "3.13.2",
@@ -85,7 +87,6 @@
     "koa-body": "4.2.0",
     "koa-compress": "4.0.1",
     "koa-connect": "2.1.0",
-    "koa-pino-logger": "3.0.0",
     "koa-send": "5.0.0",
     "koa-session": "5.12.0",
     "koa-static": "5.0.0",
@@ -99,7 +100,6 @@
     "node-fetch": "2.6.7",
     "open": "8.4.0",
     "pg": "8.5.1",
-    "pino-pretty": "4.0.0",
     "posthog-node": "1.3.0",
     "pouchdb": "7.3.0",
     "pouchdb-adapter-memory": "7.2.2",
@@ -109,18 +109,17 @@
     "redis": "4",
     "server-destroy": "1.0.1",
     "snowflake-promise": "^4.5.0",
-    "socket.io": "^4.5.1",
+    "socket.io": "4.6.1",
     "svelte": "3.49.0",
     "swagger-parser": "10.0.3",
     "tar": "6.1.11",
     "to-json-schema": "0.2.5",
     "uuid": "3.3.2",
     "validate.js": "0.13.1",
-    "vm2": "^3.9.15",
+    "vm2": "3.9.17",
     "worker-farm": "1.7.0",
-    "xml2js": "0.4.23",
-    "yargs": "13.2.4",
-    "zlib": "1.0.5"
+    "xml2js": "0.5.0",
+    "yargs": "13.2.4"
   },
   "devDependencies": {
     "@babel/core": "7.17.4",
@@ -149,7 +148,7 @@
     "@types/tar": "6.1.3",
     "@typescript-eslint/parser": "5.45.0",
     "apidoc": "0.50.4",
-    "babel-jest": "27.5.1",
+    "babel-jest": "29.5.0",
     "copyfiles": "2.4.1",
     "docker-compose": "0.23.17",
     "eslint": "6.8.0",
@@ -157,6 +156,7 @@
     "is-wsl": "2.2.0",
     "jest": "29.5.0",
     "jest-openapi": "0.14.2",
+    "jest-runner": "29.5.0",
     "jest-serial-runner": "^1.2.1",
     "nodemon": "2.0.15",
     "openapi-types": "9.3.1",
@@ -176,5 +176,5 @@
   "optionalDependencies": {
     "oracledb": "5.3.0"
   },
-  "gitHead": "1a054856a4aa2b39142e7b7800f8ae39f5904ecc"
+  "gitHead": "1d50b1f07c1a77b21d9757534c353631ce3314f8"
 }

package/scripts/dev/manage.js

@@ -45,6 +45,8 @@ async function init() {
       BB_ADMIN_USER_PASSWORD: "",
       PLUGINS_DIR: "",
       TENANT_FEATURE_FLAGS: "*:LICENSING,*:USER_GROUPS,*:ONBOARDING_TOUR",
+      HTTP_MIGRATIONS: "0",
+      HTTP_LOGGING: "0",
     }
     let envFile = ""
     Object.keys(envFileJson).forEach(key => {

package/scripts/integrations/mssql/data/entrypoint.sh

@@ -11,6 +11,7 @@ if [ "$1" = '/opt/mssql/bin/sqlservr' ]; then
 
       echo "RUNNING BUDIBASE SETUP"
 
+      cat setup.sql
       #run the setup script to create the DB and the schema in the DB
       /opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P Passw0rd -i setup.sql
 

package/scripts/integrations/mssql/data/setup.sql

@@ -34,7 +34,7 @@ GO
 CREATE TABLE people
 (
   name varchar(30) NOT NULL,
-  age varchar(20),
+  age int default 20 NOT NULL,
   CONSTRAINT pk_people PRIMARY KEY NONCLUSTERED (name, age)
 );
   
@@ -50,22 +50,22 @@ VALUES
   ('Processing', 1);
 
 INSERT INTO people (name, age)
-VALUES ('Bob', '30'),
-  ('Bert', '10'),
-  ('Jack', '12'),
-  ('Mike', '31'),
-  ('Dave', '44'),
-  ('Jim', '43'),
-  ('Kerry', '32'),
-  ('Julie', '12'),
-  ('Kim', '55'),
-  ('Andy', '33'),
-  ('John', '22'),
-  ('Ruth', '66'),
-  ('Robert', '88'),
-  ('Bobert', '99'),
-  ('Jan', '22'),
-  ('Megan', '11');
+VALUES ('Bob', 30),
+  ('Bert', 10),
+  ('Jack', 12),
+  ('Mike', 31),
+  ('Dave', 44),
+  ('Jim', 43),
+  ('Kerry', 32),
+  ('Julie', 12),
+  ('Kim', 55),
+  ('Andy', 33),
+  ('John', 22),
+  ('Ruth', 66),
+  ('Robert', 88),
+  ('Bobert', 99),
+  ('Jan', 22),
+  ('Megan', 11);
 
 
 IF OBJECT_ID ('Chains.sizes', 'U') IS NOT NULL

package/scripts/integrations/mysql/init.sql

@@ -3,7 +3,7 @@ USE main;
 CREATE TABLE Persons (
     PersonID int NOT NULL AUTO_INCREMENT,
     CreatedAt datetime,
-    Age float,
+    Age float DEFAULT 20 NOT NULL,
     LastName varchar(255),
     FirstName varchar(255),
     Address varchar(255),

package/scripts/integrations/postgres/init.sql

@@ -8,6 +8,7 @@ CREATE TABLE Persons (
     FirstName varchar(255),
     Address varchar(255),
     City varchar(255) DEFAULT 'Belfast',
+    Age INTEGER DEFAULT 20 NOT NULL,
     Type person_job
 );
 CREATE TABLE Tasks (

package/src/api/controllers/application.ts

@@ -1,5 +1,4 @@
 import env from "../../environment"
-import packageJson from "../../../package.json"
 import {
   createLinkView,
   createRoutingView,
@@ -24,6 +23,7 @@ import {
   migrations,
   objectStore,
   ErrorCode,
+  env as envCore,
 } from "@budibase/backend-core"
 import { USERS_TABLE_SCHEMA } from "../../constants"
 import { buildDefaultDocs } from "../../db/defaultData/datasource_bb_default"
@@ -223,7 +223,7 @@ export async function fetchAppPackage(ctx: UserCtx) {
   )
 
   ctx.body = {
-    application,
+    application: { ...application, upgradableVersion: envCore.VERSION },
     screens,
     layouts,
     clientLibPath,
@@ -264,7 +264,7 @@ async function performAppCreate(ctx: UserCtx) {
       _rev: undefined,
       appId,
       type: "app",
-      version: packageJson.version,
+      version: envCore.VERSION,
       componentLibraries: ["@budibase/standard-components"],
       name: name,
       url: url,
@@ -433,7 +433,7 @@ export async function updateClient(ctx: UserCtx) {
   }
 
   // Update versions in app package
-  const updatedToVersion = packageJson.version
+  const updatedToVersion = envCore.VERSION
   const appPackageUpdates = {
     version: updatedToVersion,
     revertableVersion: currentVersion,

package/src/api/controllers/automation.ts

@@ -16,9 +16,15 @@ import { setTestFlag, clearTestFlag } from "../../utilities/redis"
 import { context, cache, events } from "@budibase/backend-core"
 import { automations } from "@budibase/pro"
 import { Automation, BBContext } from "@budibase/types"
+import { getActionDefinitions as actionDefs } from "../../automations/actions"
 
-const ACTION_DEFS = removeDeprecated(actions.ACTION_DEFINITIONS)
-const TRIGGER_DEFS = removeDeprecated(triggers.TRIGGER_DEFINITIONS)
+async function getActionDefinitions() {
+  return removeDeprecated(await actionDefs())
+}
+
+function getTriggerDefinitions() {
+  return removeDeprecated(triggers.TRIGGER_DEFINITIONS)
+}
 
 /*************************
  *                       *
@@ -228,17 +234,17 @@ export async function clearLogError(ctx: BBContext) {
 }
 
 export async function getActionList(ctx: BBContext) {
-  ctx.body = ACTION_DEFS
+  ctx.body = await getActionDefinitions()
 }
 
 export async function getTriggerList(ctx: BBContext) {
-  ctx.body = TRIGGER_DEFS
+  ctx.body = getTriggerDefinitions()
 }
 
 export async function getDefinitionList(ctx: BBContext) {
   ctx.body = {
-    trigger: TRIGGER_DEFS,
-    action: ACTION_DEFS,
+    trigger: getTriggerDefinitions(),
+    action: await getActionDefinitions(),
   }
 }