@budibase/server 2.6.18 → 2.6.19-alpha.1

package/dist/integrations/mongodb.js

@@ -28,6 +28,7 @@ const getSchema = () => {
         friendlyName: "MongoDB",
         type: "Non-relational",
         description: "MongoDB is a general purpose, document-based, distributed database built for modern application developers and for the cloud era.",
+        features: [types_1.DatasourceFeature.CONNECTION_CHECKING],
         datasource: {
             connectionString: {
                 type: types_1.DatasourceFieldType.STRING,
@@ -340,6 +341,21 @@ class MongoIntegration {
         };
         this.client = new mongodb_1.MongoClient(config.connectionString, options);
     }
+    testConnection() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const response = {
+                connected: false,
+            };
+            try {
+                yield this.connect();
+                response.connected = true;
+            }
+            catch (e) {
+                response.error = e.message;
+            }
+            return response;
+        });
+    }
     connect() {
         return __awaiter(this, void 0, void 0, function* () {
             return this.client.connect();

package/dist/integrations/mysql.js

@@ -17,13 +17,14 @@ const utils_1 = require("./utils");
 const dayjs_1 = __importDefault(require("dayjs"));
 const utilities_1 = require("../utilities");
 const sql_1 = __importDefault(require("./base/sql"));
-const mysql = require("mysql2/promise");
+const promise_1 = __importDefault(require("mysql2/promise"));
 const SCHEMA = {
     docs: "https://github.com/sidorares/node-mysql2",
     plus: true,
     friendlyName: "MySQL",
     type: "Relational",
     description: "MySQL Database Service is a fully managed database service to deploy cloud-native applications. ",
+    features: [types_1.DatasourceFeature.CONNECTION_CHECKING],
     datasource: {
         host: {
             type: types_1.DatasourceFieldType.STRING,
@@ -74,7 +75,6 @@ const SCHEMA = {
         },
     },
 };
-const TimezoneAwareDateTypes = ["timestamp"];
 function bindingTypeCoerce(bindings) {
     for (let i = 0; i < bindings.length; i++) {
         const binding = bindings[i];
@@ -108,7 +108,8 @@ class MySQLIntegration extends sql_1.default {
         // make sure this defaults to true
         if (config.rejectUnauthorized != null &&
             !config.rejectUnauthorized &&
-            config.ssl) {
+            config.ssl &&
+            typeof config.ssl !== "string") {
             config.ssl.rejectUnauthorized = config.rejectUnauthorized;
         }
         // @ts-ignore
@@ -127,6 +128,21 @@ class MySQLIntegration extends sql_1.default {
                 return next();
             } });
     }
+    testConnection() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const response = {
+                connected: false,
+            };
+            try {
+                const [result] = yield this.internalQuery({ sql: "SELECT 1+1 AS checkRes" }, { connect: true });
+                response.connected = (result === null || result === void 0 ? void 0 : result.checkRes) == 2;
+            }
+            catch (e) {
+                response.error = e.message;
+            }
+            return response;
+        });
+    }
     getBindingIdentifier() {
         return "?";
     }
@@ -135,7 +151,7 @@ class MySQLIntegration extends sql_1.default {
     }
     connect() {
         return __awaiter(this, void 0, void 0, function* () {
-            this.client = yield mysql.createConnection(this.config);
+            this.client = yield promise_1.default.createConnection(this.config);
         });
     }
     disconnect() {
@@ -161,7 +177,7 @@ class MySQLIntegration extends sql_1.default {
                 return response[0];
             }
             finally {
-                if (opts === null || opts === void 0 ? void 0 : opts.connect) {
+                if ((opts === null || opts === void 0 ? void 0 : opts.connect) && this.client) {
                     yield this.disconnect();
                 }
             }

package/dist/integrations/oracle.js

@@ -30,6 +30,7 @@ const SCHEMA = {
     friendlyName: "Oracle",
     type: "Relational",
     description: "Oracle Database is an object-relational database management system developed by Oracle Corporation",
+    features: [types_1.DatasourceFeature.CONNECTION_CHECKING],
     datasource: {
         host: {
             type: types_1.DatasourceFieldType.STRING,
@@ -271,6 +272,34 @@ class OracleIntegration extends sql_1.default {
             this.schemaErrors = final.errors;
         });
     }
+    testConnection() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const response = {
+                connected: false,
+            };
+            let connection;
+            try {
+                connection = yield this.getConnection();
+                response.connected = true;
+            }
+            catch (err) {
+                response.connected = false;
+                response.error = err.message;
+            }
+            finally {
+                if (connection) {
+                    try {
+                        yield connection.close();
+                    }
+                    catch (err) {
+                        response.connected = false;
+                        response.error = err.message;
+                    }
+                }
+            }
+            return response;
+        });
+    }
     internalQuery(query) {
         return __awaiter(this, void 0, void 0, function* () {
             let connection;

package/dist/integrations/postgres.js

@@ -16,14 +16,14 @@ 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 pg_1 = require("pg");
 // 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.
-if (types) {
-    types.setTypeParser(1114, (val) => val); // timestamp
-    types.setTypeParser(1082, (val) => val); // date
-    types.setTypeParser(1184, (val) => val); // timestampz
+if (pg_1.types) {
+    pg_1.types.setTypeParser(1114, (val) => val); // timestamp
+    pg_1.types.setTypeParser(1082, (val) => val); // date
+    pg_1.types.setTypeParser(1184, (val) => val); // timestampz
 }
 const JSON_REGEX = /'{.*}'::json/s;
 const SCHEMA = {
@@ -32,6 +32,7 @@ const SCHEMA = {
     friendlyName: "PostgreSQL",
     type: "Relational",
     description: "PostgreSQL, also known as Postgres, is a free and open-source relational database management system emphasizing extensibility and SQL compliance.",
+    features: [types_1.DatasourceFeature.CONNECTION_CHECKING],
     datasource: {
         host: {
             type: types_1.DatasourceFieldType.STRING,
@@ -116,9 +117,27 @@ class PostgresIntegration extends sql_1.default {
                     ca: this.config.ca,
                 }
                 : undefined });
-        this.client = new Client(newConfig);
+        this.client = new pg_1.Client(newConfig);
         this.open = false;
     }
+    testConnection() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const response = {
+                connected: false,
+            };
+            try {
+                yield this.openConnection();
+                response.connected = true;
+            }
+            catch (e) {
+                response.error = e.message;
+            }
+            finally {
+                yield this.closeConnection();
+            }
+            return response;
+        });
+    }
     getBindingIdentifier() {
         return `$${this.index++}`;
     }
@@ -131,7 +150,7 @@ class PostgresIntegration extends sql_1.default {
             if (!this.config.schema) {
                 this.config.schema = "public";
             }
-            this.client.query(`SET search_path TO ${this.config.schema}`);
+            yield this.client.query(`SET search_path TO ${this.config.schema}`);
             this.COLUMNS_SQL = `select * from information_schema.columns where table_schema = '${this.config.schema}'`;
             this.open = true;
         });

package/dist/integrations/redis.js

@@ -16,9 +16,10 @@ const types_1 = require("@budibase/types");
 const ioredis_1 = __importDefault(require("ioredis"));
 const SCHEMA = {
     docs: "https://redis.io/docs/",
-    description: "",
+    description: "Redis is a caching tool, providing powerful key-value store capabilities.",
     friendlyName: "Redis",
     type: "Non-relational",
+    features: [types_1.DatasourceFeature.CONNECTION_CHECKING],
     datasource: {
         host: {
             type: "string",
@@ -99,6 +100,24 @@ class RedisIntegration {
             db: this.config.db,
         });
     }
+    testConnection() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const response = {
+                connected: false,
+            };
+            try {
+                yield this.client.ping();
+                response.connected = true;
+            }
+            catch (e) {
+                response.error = e.message;
+            }
+            finally {
+                yield this.disconnect();
+            }
+            return response;
+        });
+    }
     disconnect() {
         return __awaiter(this, void 0, void 0, function* () {
             return this.client.quit();

package/dist/integrations/s3.js

@@ -8,15 +8,19 @@ 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 });
 const types_1 = require("@budibase/types");
-const AWS = require("aws-sdk");
-const csv = require("csvtojson");
+const aws_sdk_1 = __importDefault(require("aws-sdk"));
+const csvtojson_1 = __importDefault(require("csvtojson"));
 const SCHEMA = {
     docs: "https://docs.aws.amazon.com/AWSJavaScriptSDK/latest/AWS/S3.html",
     description: "Amazon Simple Storage Service (Amazon S3) is an object storage service that offers industry-leading scalability, data availability, security, and performance.",
     friendlyName: "Amazon S3",
     type: "Object store",
+    features: [types_1.DatasourceFeature.CONNECTION_CHECKING],
     datasource: {
         region: {
             type: "string",
@@ -153,7 +157,22 @@ class S3Integration {
         else {
             delete this.config.endpoint;
         }
-        this.client = new AWS.S3(this.config);
+        this.client = new aws_sdk_1.default.S3(this.config);
+    }
+    testConnection() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const response = {
+                connected: false,
+            };
+            try {
+                yield this.client.listBuckets().promise();
+                response.connected = true;
+            }
+            catch (e) {
+                response.error = e.message;
+            }
+            return response;
+        });
     }
     create(query) {
         var _a;
@@ -202,7 +221,7 @@ class S3Integration {
                 stream.on("error", (err) => {
                     reject(err);
                 });
-                const response = csv()
+                const response = (0, csvtojson_1.default)()
                     .fromStream(stream)
                     .on("error", () => {
                     csvError = true;

package/dist/integrations/snowflake.js

@@ -16,6 +16,7 @@ const SCHEMA = {
     description: "Snowflake is a solution for data warehousing, data lakes, data engineering, data science, data application development, and securely sharing and consuming shared data.",
     friendlyName: "Snowflake",
     type: "Relational",
+    features: [types_1.DatasourceFeature.CONNECTION_CHECKING],
     datasource: {
         account: {
             type: "string",
@@ -61,6 +62,20 @@ class SnowflakeIntegration {
     constructor(config) {
         this.client = new snowflake_promise_1.Snowflake(config);
     }
+    testConnection() {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                yield this.client.connect();
+                return { connected: true };
+            }
+            catch (e) {
+                return {
+                    connected: false,
+                    error: e.message,
+                };
+            }
+        });
+    }
     internalQuery(query) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.client.connect();

package/dist/migrations/functions/backfill/app/queries.js

@@ -12,7 +12,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.backfill = void 0;
 const backend_core_1 = require("@budibase/backend-core");
 const utils_1 = require("../../../../db/utils");
-const types_1 = require("@budibase/types");
 const getQueries = (appDb) => __awaiter(void 0, void 0, void 0, function* () {
     const response = yield appDb.allDocs((0, utils_1.getQueryParams)(null, {
         include_docs: true,
@@ -36,7 +35,7 @@ const backfill = (appDb, timestamp) => __awaiter(void 0, void 0, void 0, functio
                 datasource = {
                     type: "unknown",
                     _id: query.datasourceId,
-                    source: types_1.SourceName.UNKNOWN,
+                    source: "unknown",
                 };
             }
             else {

package/dist/sdk/app/datasources/datasources.js

@@ -8,6 +8,9 @@ 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.mergeConfigs = exports.removeSecretSingle = exports.removeSecrets = exports.getWithEnvVars = exports.get = exports.enrich = exports.checkDatasourceTypes = void 0;
 const backend_core_1 = require("@budibase/backend-core");
@@ -16,6 +19,7 @@ const types_1 = require("@budibase/types");
 const fp_1 = require("lodash/fp");
 const utils_1 = require("../../utils");
 const integrations_1 = require("../../../integrations");
+const lodash_1 = __importDefault(require("lodash"));
 const ENV_VAR_PREFIX = "env.";
 function checkDatasourceTypes(schema, config) {
     for (let key of Object.keys(config)) {
@@ -130,7 +134,7 @@ function removeSecretSingle(datasource) {
 }
 exports.removeSecretSingle = removeSecretSingle;
 function mergeConfigs(update, old) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e;
     if (!update.config) {
         return update;
     }
@@ -149,13 +153,16 @@ function mergeConfigs(update, old) {
             }
         }
     }
+    if ((_c = old.config) === null || _c === void 0 ? void 0 : _c.auth) {
+        update.config = lodash_1.default.merge(old.config, update.config);
+    }
     // update back to actual passwords for everything else
     for (let [key, value] of Object.entries(update.config)) {
         if (value !== types_1.PASSWORD_REPLACEMENT) {
             continue;
         }
-        if ((_c = old.config) === null || _c === void 0 ? void 0 : _c[key]) {
-            update.config[key] = (_d = old.config) === null || _d === void 0 ? void 0 : _d[key];
+        if ((_d = old.config) === null || _d === void 0 ? void 0 : _d[key]) {
+            update.config[key] = (_e = old.config) === null || _e === void 0 ? void 0 : _e[key];
         }
         else {
             delete update.config[key];