@budibase/server 1.0.79-alpha.7 → 1.0.79

package/dist/integrations/mysql.js

@@ -13,10 +13,10 @@ const datasource_1 = require("../definitions/datasource");
 const utils_1 = require("./utils");
 var MySQLModule;
 (function (MySQLModule) {
-    const mysql = require("mysql2");
+    const mysql = require("mysql2/promise");
     const Sql = require("./base/sql");
     const SCHEMA = {
-        docs: "https://github.com/mysqljs/mysql",
+        docs: "https://github.com/sidorares/node-mysql2",
         plus: true,
         friendlyName: "MySQL",
         description: "MySQL Database Service is a fully managed database service to deploy cloud-native applications. ",
@@ -65,25 +65,6 @@ var MySQLModule;
             },
         },
     };
-    function internalQuery(client, query, connect = true) {
-        // Node MySQL is callback based, so we must wrap our call in a promise
-        return new Promise((resolve, reject) => {
-            if (connect) {
-                client.connect();
-            }
-            return client.query(query.sql, query.bindings || {}, (error, results) => {
-                if (error) {
-                    reject(error);
-                }
-                else {
-                    resolve(results);
-                }
-                if (connect) {
-                    client.end();
-                }
-            });
-        });
-    }
     class MySQLIntegration extends Sql {
         constructor(config) {
             super(utils_1.SqlClients.MY_SQL);
@@ -93,49 +74,81 @@ var MySQLModule;
             if (config.ssl && Object.keys(config.ssl).length === 0) {
                 delete config.ssl;
             }
-            this.client = mysql.createConnection(config);
+            this.config = config;
+        }
+        connect() {
+            return __awaiter(this, void 0, void 0, function* () {
+                this.client = yield mysql.createConnection(this.config);
+            });
+        }
+        disconnect() {
+            return __awaiter(this, void 0, void 0, function* () {
+                yield this.client.end();
+            });
+        }
+        internalQuery(query, connect = true) {
+            return __awaiter(this, void 0, void 0, function* () {
+                try {
+                    if (connect) {
+                        yield this.connect();
+                    }
+                    // Node MySQL is callback based, so we must wrap our call in a promise
+                    const response = yield this.client.query(query.sql, query.bindings || []);
+                    return response[0];
+                }
+                finally {
+                    if (connect) {
+                        yield this.disconnect();
+                    }
+                }
+            });
         }
         buildSchema(datasourceId, entities) {
             return __awaiter(this, void 0, void 0, function* () {
                 const tables = {};
                 const database = this.config.database;
-                this.client.connect();
-                // get the tables first
-                const tablesResp = yield internalQuery(this.client, { sql: "SHOW TABLES;" }, false);
-                const tableNames = tablesResp.map((obj) => obj[`Tables_in_${database}`] ||
-                    obj[`Tables_in_${database.toLowerCase()}`]);
-                for (let tableName of tableNames) {
-                    const primaryKeys = [];
-                    const schema = {};
-                    const descResp = yield internalQuery(this.client, { sql: `DESCRIBE \`${tableName}\`;` }, false);
-                    for (let column of descResp) {
-                        const columnName = column.Field;
-                        if (column.Key === "PRI" && primaryKeys.indexOf(column.Key) === -1) {
-                            primaryKeys.push(columnName);
+                yield this.connect();
+                try {
+                    // get the tables first
+                    const tablesResp = yield this.internalQuery({ sql: "SHOW TABLES;" }, false);
+                    const tableNames = tablesResp.map((obj) => obj[`Tables_in_${database}`] ||
+                        obj[`Tables_in_${database.toLowerCase()}`]);
+                    for (let tableName of tableNames) {
+                        const primaryKeys = [];
+                        const schema = {};
+                        const descResp = yield this.internalQuery({ sql: `DESCRIBE \`${tableName}\`;` }, false);
+                        for (let column of descResp) {
+                            const columnName = column.Field;
+                            if (column.Key === "PRI" &&
+                                primaryKeys.indexOf(column.Key) === -1) {
+                                primaryKeys.push(columnName);
+                            }
+                            const constraints = {
+                                presence: column.Null !== "YES",
+                            };
+                            const isAuto = typeof column.Extra === "string" &&
+                                (column.Extra === "auto_increment" ||
+                                    column.Extra.toLowerCase().includes("generated"));
+                            schema[columnName] = {
+                                name: columnName,
+                                autocolumn: isAuto,
+                                type: utils_1.convertSqlType(column.Type),
+                                constraints,
+                            };
+                        }
+                        if (!tables[tableName]) {
+                            tables[tableName] = {
+                                _id: utils_1.buildExternalTableId(datasourceId, tableName),
+                                primary: primaryKeys,
+                                name: tableName,
+                                schema,
+                            };
                         }
-                        const constraints = {
-                            presence: column.Null !== "YES",
-                        };
-                        const isAuto = typeof column.Extra === "string" &&
-                            (column.Extra === "auto_increment" ||
-                                column.Extra.toLowerCase().includes("generated"));
-                        schema[columnName] = {
-                            name: columnName,
-                            autocolumn: isAuto,
-                            type: utils_1.convertSqlType(column.Type),
-                            constraints,
-                        };
-                    }
-                    if (!tables[tableName]) {
-                        tables[tableName] = {
-                            _id: utils_1.buildExternalTableId(datasourceId, tableName),
-                            primary: primaryKeys,
-                            name: tableName,
-                            schema,
-                        };
                     }
                 }
-                this.client.end();
+                finally {
+                    yield this.disconnect();
+                }
                 const final = utils_1.finaliseExternalTables(tables, entities);
                 this.tables = final.tables;
                 this.schemaErrors = final.errors;
@@ -143,34 +156,37 @@ var MySQLModule;
         }
         create(query) {
             return __awaiter(this, void 0, void 0, function* () {
-                const results = yield internalQuery(this.client, utils_1.getSqlQuery(query));
+                const results = yield this.internalQuery(utils_1.getSqlQuery(query));
                 return results.length ? results : [{ created: true }];
             });
         }
         read(query) {
             return __awaiter(this, void 0, void 0, function* () {
-                return internalQuery(this.client, utils_1.getSqlQuery(query));
+                return this.internalQuery(utils_1.getSqlQuery(query));
             });
         }
         update(query) {
             return __awaiter(this, void 0, void 0, function* () {
-                const results = yield internalQuery(this.client, utils_1.getSqlQuery(query));
+                const results = yield this.internalQuery(utils_1.getSqlQuery(query));
                 return results.length ? results : [{ updated: true }];
             });
         }
         delete(query) {
             return __awaiter(this, void 0, void 0, function* () {
-                const results = yield internalQuery(this.client, utils_1.getSqlQuery(query));
+                const results = yield this.internalQuery(utils_1.getSqlQuery(query));
                 return results.length ? results : [{ deleted: true }];
             });
         }
         query(json) {
             return __awaiter(this, void 0, void 0, function* () {
-                this.client.connect();
-                const queryFn = (query) => internalQuery(this.client, query, false);
-                const output = yield this.queryWithReturning(json, queryFn);
-                this.client.end();
-                return output;
+                yield this.connect();
+                try {
+                    const queryFn = (query) => this.internalQuery(query, false);
+                    return yield this.queryWithReturning(json, queryFn);
+                }
+                finally {
+                    yield this.disconnect();
+                }
             });
         }
     }

package/dist/integrations/utils.js

@@ -40,7 +40,7 @@ var SqlClients;
 (function (SqlClients) {
     SqlClients["MS_SQL"] = "mssql";
     SqlClients["POSTGRES"] = "pg";
-    SqlClients["MY_SQL"] = "mysql";
+    SqlClients["MY_SQL"] = "mysql2";
     SqlClients["ORACLE"] = "oracledb";
 })(SqlClients = exports.SqlClients || (exports.SqlClients = {}));
 function isExternalTable(tableId) {

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "1.0.79-alpha.6",
+    "version": "1.0.78",
     "description": "Budibase Web Server",
     "main": "src/index.ts",
     "repository": {
@@ -25,7 +25,6 @@
         "generate:proxy:preprod": "node scripts/proxy/generateProxyConfig preprod",
         "generate:proxy:prod": "node scripts/proxy/generateProxyConfig prod",
         "format": "prettier --config ../../.prettierrc.json 'src/**/*.ts' --write",
-        "specs": "node specs/generate.js && openapi-typescript specs/openapi.yaml --output src/definitions/openapi.ts",
         "lint": "eslint --fix src/",
         "lint:fix": "yarn run format && yarn run lint",
         "initialise": "node scripts/initialise.js",
@@ -74,9 +73,9 @@
     "license": "GPL-3.0",
     "dependencies": {
         "@apidevtools/swagger-parser": "^10.0.3",
-        "@budibase/backend-core": "^1.0.79-alpha.6",
-        "@budibase/client": "^1.0.79-alpha.6",
-        "@budibase/string-templates": "^1.0.79-alpha.6",
+        "@budibase/backend-core": "^1.0.78",
+        "@budibase/client": "^1.0.78",
+        "@budibase/string-templates": "^1.0.78",
         "@bull-board/api": "^3.7.0",
         "@bull-board/koa": "^3.7.0",
         "@elastic/elasticsearch": "7.10.0",
@@ -158,15 +157,12 @@
         "docker-compose": "^0.23.6",
         "eslint": "^6.8.0",
         "jest": "^27.0.5",
-        "jest-openapi": "^0.14.2",
         "nodemon": "^2.0.4",
         "openapi-types": "^9.3.1",
-        "openapi-typescript": "^5.2.0",
         "path-to-regexp": "^6.2.0",
         "prettier": "^2.3.1",
         "rimraf": "^3.0.2",
         "supertest": "^4.0.2",
-        "swagger-jsdoc": "^6.1.0",
         "ts-jest": "^27.0.3",
         "ts-node": "^10.0.0",
         "typescript": "^4.3.5",

package/dist/tests/utilities/TestConfiguration.js

@@ -24,8 +24,6 @@ const { createASession } = require("@budibase/backend-core/sessions");
 const { user: userCache } = require("@budibase/backend-core/cache");
 const newid = require("../../db/newid");
 const context = require("@budibase/backend-core/context");
-const { generateDevInfoID, SEPARATOR } = require("@budibase/backend-core/db");
-const { encrypt } = require("@budibase/backend-core/encryption");
 const GLOBAL_USER_ID = "us_uuid1";
 const EMAIL = "babs@babs.com";
 const CSRF_TOKEN = "e3727778-7af0-4226-b5eb-f43cbe60a306";
@@ -44,9 +42,6 @@ class TestConfiguration {
     getRequest() {
         return this.request;
     }
-    getApp() {
-        return this.app;
-    }
     getAppId() {
         return this.appId;
     }
@@ -85,22 +80,6 @@ class TestConfiguration {
             }
         });
     }
-    generateApiKey(userId = GLOBAL_USER_ID) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const db = getGlobalDB(TENANT_ID);
-            const id = generateDevInfoID(userId);
-            let devInfo;
-            try {
-                devInfo = yield db.get(id);
-            }
-            catch (err) {
-                devInfo = { _id: id, userId };
-            }
-            devInfo.apiKey = encrypt(`${TENANT_ID}${SEPARATOR}${newid()}`);
-            yield db.put(devInfo);
-            return devInfo.apiKey;
-        });
-    }
     globalUser({ id = GLOBAL_USER_ID, builder = true, email = EMAIL, roles, } = {}) {
         return __awaiter(this, void 0, void 0, function* () {
             const db = getGlobalDB(TENANT_ID);
@@ -143,7 +122,7 @@ class TestConfiguration {
         }
         cleanup(this.allApps.map(app => app.appId));
     }
-    defaultHeaders(extras = {}) {
+    defaultHeaders() {
         const auth = {
             userId: GLOBAL_USER_ID,
             sessionId: "sessionid",
@@ -155,10 +134,14 @@ class TestConfiguration {
         };
         const authToken = jwt.sign(auth, env.JWT_SECRET);
         const appToken = jwt.sign(app, env.JWT_SECRET);
-        const headers = Object.assign({ Accept: "application/json", Cookie: [
+        const headers = {
+            Accept: "application/json",
+            Cookie: [
                 `${Cookies.Auth}=${authToken}`,
                 `${Cookies.CurrentApp}=${appToken}`,
-            ], [Headers.CSRF_TOKEN]: CSRF_TOKEN }, extras);
+            ],
+            [Headers.CSRF_TOKEN]: CSRF_TOKEN,
+        };
         if (this.appId) {
             headers[Headers.APP_ID] = this.appId;
         }
@@ -221,7 +204,7 @@ class TestConfiguration {
     getTable(tableId = null) {
         return __awaiter(this, void 0, void 0, function* () {
             tableId = tableId || this.table._id;
-            return this._req(null, { tableId }, controllers.table.find);
+            return this._req(null, { id: tableId }, controllers.table.find);
         });
     }
     createLinkedTable(relationshipType = null, links = ["link"]) {