@budibase/server 2.6.19-alpha.2 → 2.6.19-alpha.4

package/builder/index.html

@@ -8,7 +8,7 @@
 	<link rel="preconnect" href="https://fonts.gstatic.com" />
 	<link href="https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@400;600;700&display=swap"
 		rel="stylesheet" />
-  <script type="module" crossorigin src="/builder/assets/index.6c1171e2.js"></script>
+  <script type="module" crossorigin src="/builder/assets/index.3d5c50fb.js"></script>
   <link rel="stylesheet" href="/builder/assets/index.07382a47.css">
 </head>
 

package/dist/api/controllers/datasource.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.query = exports.find = exports.destroy = exports.save = exports.update = exports.buildSchemaFromDb = exports.verify = exports.fetch = void 0;
+exports.query = exports.find = exports.destroy = exports.save = exports.update = exports.buildSchemaFromDb = exports.information = exports.verify = exports.fetch = void 0;
 const utils_1 = require("../../db/utils");
 const internal_1 = require("./table/internal");
 const constants_1 = require("../../constants");
@@ -121,6 +121,21 @@ function verify(ctx) {
     });
 }
 exports.verify = verify;
+function information(ctx) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const datasourceId = ctx.params.datasourceId;
+        const datasource = yield sdk_1.default.datasources.get(datasourceId, { enriched: true });
+        const connector = (yield getConnector(datasource));
+        if (!connector.getTableNames) {
+            ctx.throw(400, "Table name fetching not supported by datasource");
+        }
+        const tableNames = yield connector.getTableNames();
+        ctx.body = {
+            tableNames,
+        };
+    });
+}
+exports.information = information;
 function buildSchemaFromDb(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const db = backend_core_1.context.getAppDB();

package/dist/api/routes/datasource.js

@@ -35,6 +35,7 @@ const router = new router_1.default();
 router
     .get("/api/datasources", (0, authorized_1.default)(backend_core_1.permissions.BUILDER), datasourceController.fetch)
     .post("/api/datasources/verify", (0, authorized_1.default)(backend_core_1.permissions.BUILDER), datasourceController.verify)
+    .get("/api/datasources/:datasourceId/info", (0, authorized_1.default)(backend_core_1.permissions.BUILDER), datasourceController.information)
     .get("/api/datasources/:datasourceId", (0, authorized_1.default)(backend_core_1.permissions.PermissionType.TABLE, backend_core_1.permissions.PermissionLevel.READ), datasourceController.find)
     .put("/api/datasources/:datasourceId", (0, authorized_1.default)(backend_core_1.permissions.PermissionType.TABLE, backend_core_1.permissions.PermissionLevel.READ), datasourceController.update)
     .post("/api/datasources/query", (0, authorized_1.default)(backend_core_1.permissions.PermissionType.TABLE, backend_core_1.permissions.PermissionLevel.READ), (0, validators_1.datasourceQueryValidator)(), datasourceController.query)

package/dist/integrations/googlesheets.js

@@ -37,10 +37,13 @@ const SCHEMA = {
     },
     relationships: false,
     docs: "https://developers.google.com/sheets/api/quickstart/nodejs",
-    description: "Create and collaborate on online spreadsheets in real-time and from any device. ",
+    description: "Create and collaborate on online spreadsheets in real-time and from any device.",
     friendlyName: "Google Sheets",
     type: "Spreadsheet",
-    features: [types_1.DatasourceFeature.CONNECTION_CHECKING],
+    features: [
+        types_1.DatasourceFeature.CONNECTION_CHECKING,
+        types_1.DatasourceFeature.FETCH_TABLE_NAMES,
+    ],
     datasource: {
         spreadsheetId: {
             display: "Google Sheet URL",
@@ -115,7 +118,6 @@ class GoogleSheetsIntegration {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 yield this.connect();
-                yield this.client.loadInfo();
                 return { connected: true };
             }
             catch (e) {
@@ -196,6 +198,13 @@ class GoogleSheetsIntegration {
             }
         });
     }
+    getTableNames() {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.connect();
+            const sheets = this.client.sheetsByIndex;
+            return sheets.map(s => s.title);
+        });
+    }
     getTableSchema(title, headerValues, id) {
         // base table
         const table = {

package/dist/integrations/microsoftSqlServer.js

@@ -23,7 +23,10 @@ const SCHEMA = {
     description: "Microsoft SQL Server is a relational database management system developed by Microsoft. ",
     friendlyName: "MS SQL Server",
     type: "Relational",
-    features: [types_1.DatasourceFeature.CONNECTION_CHECKING],
+    features: [
+        types_1.DatasourceFeature.CONNECTION_CHECKING,
+        types_1.DatasourceFeature.FETCH_TABLE_NAMES,
+    ],
     datasource: {
         user: {
             type: types_1.DatasourceFieldType.STRING,
@@ -241,6 +244,22 @@ class SqlServerIntegration extends sql_1.default {
             this.schemaErrors = final.errors;
         });
     }
+    queryTableNames() {
+        return __awaiter(this, void 0, void 0, function* () {
+            let tableInfo = yield this.runSQL(this.TABLES_SQL);
+            const schema = this.config.schema || DEFAULT_SCHEMA;
+            return tableInfo
+                .filter((record) => record.TABLE_SCHEMA === schema)
+                .map((record) => record.TABLE_NAME)
+                .filter((name) => this.MASTER_TABLES.indexOf(name) === -1);
+        });
+    }
+    getTableNames() {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.connect();
+            return this.queryTableNames();
+        });
+    }
     read(query) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.connect();

package/dist/integrations/mysql.js

@@ -24,7 +24,10 @@ const SCHEMA = {
     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],
+    features: [
+        types_1.DatasourceFeature.CONNECTION_CHECKING,
+        types_1.DatasourceFeature.FETCH_TABLE_NAMES,
+    ],
     datasource: {
         host: {
             type: types_1.DatasourceFieldType.STRING,
@@ -186,13 +189,10 @@ class MySQLIntegration extends sql_1.default {
     buildSchema(datasourceId, entities) {
         return __awaiter(this, void 0, void 0, function* () {
             const tables = {};
-            const database = this.config.database;
             yield this.connect();
             try {
                 // get the tables first
-                const tablesResp = yield this.internalQuery({ sql: "SHOW TABLES;" }, { connect: false });
-                const tableNames = tablesResp.map((obj) => obj[`Tables_in_${database}`] ||
-                    obj[`Tables_in_${database.toLowerCase()}`]);
+                const tableNames = yield this.queryTableNames();
                 for (let tableName of tableNames) {
                     const primaryKeys = [];
                     const schema = {};
@@ -230,6 +230,25 @@ class MySQLIntegration extends sql_1.default {
             this.schemaErrors = final.errors;
         });
     }
+    queryTableNames() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const database = this.config.database;
+            const tablesResp = yield this.internalQuery({ sql: "SHOW TABLES;" }, { connect: false });
+            return tablesResp.map((obj) => obj[`Tables_in_${database}`] ||
+                obj[`Tables_in_${database.toLowerCase()}`]);
+        });
+    }
+    getTableNames() {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.connect();
+            try {
+                return this.queryTableNames();
+            }
+            finally {
+                yield this.disconnect();
+            }
+        });
+    }
     create(query) {
         return __awaiter(this, void 0, void 0, function* () {
             const results = yield this.internalQuery((0, utils_1.getSqlQuery)(query));

package/dist/integrations/oracle.js

@@ -30,7 +30,10 @@ 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],
+    features: [
+        types_1.DatasourceFeature.CONNECTION_CHECKING,
+        types_1.DatasourceFeature.FETCH_TABLE_NAMES,
+    ],
     datasource: {
         host: {
             type: types_1.DatasourceFieldType.STRING,
@@ -272,6 +275,14 @@ class OracleIntegration extends sql_1.default {
             this.schemaErrors = final.errors;
         });
     }
+    getTableNames() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const columnsResponse = yield this.internalQuery({
+                sql: this.COLUMNS_SQL,
+            });
+            return (columnsResponse.rows || []).map(row => row.TABLE_NAME);
+        });
+    }
     testConnection() {
         return __awaiter(this, void 0, void 0, function* () {
             const response = {

package/dist/integrations/postgres.js

@@ -32,7 +32,10 @@ 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],
+    features: [
+        types_1.DatasourceFeature.CONNECTION_CHECKING,
+        types_1.DatasourceFeature.FETCH_TABLE_NAMES,
+    ],
     datasource: {
         host: {
             type: types_1.DatasourceFieldType.STRING,
@@ -101,14 +104,15 @@ class PostgresIntegration extends sql_1.default {
         this.index = 1;
         this.tables = {};
         this.schemaErrors = {};
-        this.PRIMARY_KEYS_SQL = `
-  select tc.table_schema, tc.table_name, kc.column_name as primary_key 
-  from information_schema.table_constraints tc
-  join 
-    information_schema.key_column_usage kc on kc.table_name = tc.table_name 
-    and kc.table_schema = tc.table_schema 
-    and kc.constraint_name = tc.constraint_name
-  where tc.constraint_type = 'PRIMARY KEY';
+        this.PRIMARY_KEYS_SQL = () => `
+  SELECT pg_namespace.nspname table_schema
+     , pg_class.relname table_name
+     , pg_attribute.attname primary_key
+  FROM pg_class
+  JOIN pg_index ON pg_class.oid = pg_index.indrelid AND pg_index.indisprimary
+  JOIN pg_attribute ON pg_attribute.attrelid = pg_class.oid AND pg_attribute.attnum = ANY(pg_index.indkey)
+  JOIN pg_namespace ON pg_namespace.oid = pg_class.relnamespace
+  WHERE pg_namespace.nspname = '${this.config.schema}';
   `;
         this.config = config;
         let newConfig = Object.assign(Object.assign({}, this.config), { ssl: this.config.ssl
@@ -212,7 +216,7 @@ class PostgresIntegration extends sql_1.default {
             let tableKeys = {};
             yield this.openConnection();
             try {
-                const primaryKeysResponse = yield this.client.query(this.PRIMARY_KEYS_SQL);
+                const primaryKeysResponse = yield this.client.query(this.PRIMARY_KEYS_SQL());
                 for (let table of primaryKeysResponse.rows) {
                     const tableName = table.table_name;
                     if (!tableKeys[tableName]) {
@@ -270,6 +274,18 @@ class PostgresIntegration extends sql_1.default {
             }
         });
     }
+    getTableNames() {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                yield this.openConnection();
+                const columnsResponse = yield this.client.query(this.COLUMNS_SQL);
+                return columnsResponse.rows.map(row => row.table_name);
+            }
+            finally {
+                yield this.closeConnection();
+            }
+        });
+    }
     create(query) {
         return __awaiter(this, void 0, void 0, function* () {
             const response = yield this.internalQuery((0, utils_1.getSqlQuery)(query));