@budibase/server 1.0.80-alpha.0 → 1.0.80-alpha.3

package/coverage/lcov-report/utilities/usageQuota/rows.js.html

@@ -289,7 +289,7 @@ exports.getUniqueRows = async appIds => {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Fri Mar 04 2022 11:33:15 GMT+0000 (Coordinated Universal Time)
+                at Mon Mar 07 2022 17:22:13 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

package/coverage/lcov-report/utilities/usageQuota/usageQuoteReset.js.html

@@ -118,7 +118,7 @@ function <span class="fstat-no" title="function not covered" >resetQuotasIfRequi
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Fri Mar 04 2022 11:33:15 GMT+0000 (Coordinated Universal Time)
+                at Mon Mar 07 2022 17:22:13 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

package/coverage/lcov-report/utilities/users.js.html

@@ -136,7 +136,7 @@ exports.getFullUser = async (ctx, userId) => {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Fri Mar 04 2022 11:33:15 GMT+0000 (Coordinated Universal Time)
+                at Mon Mar 07 2022 17:22:13 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

package/coverage/lcov-report/utilities/workerRequests.js.html

@@ -481,7 +481,7 @@ exports.readGlobalUser = <span class="fstat-no" title="function not covered" >as
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Fri Mar 04 2022 11:33:15 GMT+0000 (Coordinated Universal Time)
+                at Mon Mar 07 2022 17:22:13 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

package/dist/integrations/base/sql.js

@@ -232,6 +232,9 @@ class InternalBuilder {
     create(knex, json, opts) {
         const { endpoint, body } = json;
         let query = knex(endpoint.entityId);
+        if (endpoint.schema) {
+            query = query.withSchema(endpoint.schema);
+        }
         const parsedBody = parseBody(body);
         // make sure no null values in body for creation
         for (let [key, value] of Object.entries(parsedBody)) {
@@ -250,6 +253,9 @@ class InternalBuilder {
     bulkCreate(knex, json) {
         const { endpoint, body } = json;
         let query = knex(endpoint.entityId);
+        if (endpoint.schema) {
+            query = query.withSchema(endpoint.schema);
+        }
         if (!Array.isArray(body)) {
             return query;
         }
@@ -257,7 +263,7 @@ class InternalBuilder {
         return query.insert(parsedBody);
     }
     read(knex, json, limit) {
-        let { endpoint, resource, filters, sort, paginate, relationships } = json;
+        let { endpoint, resource, filters, paginate, relationships } = json;
         const tableName = endpoint.entityId;
         // select all if not specified
         if (!resource) {
@@ -285,6 +291,9 @@ class InternalBuilder {
         }
         // start building the query
         let query = knex(tableName).limit(foundLimit);
+        if (endpoint.schema) {
+            query = query.withSchema(endpoint.schema);
+        }
         if (foundOffset) {
             query = query.offset(foundOffset);
         }
@@ -307,6 +316,9 @@ class InternalBuilder {
     update(knex, json, opts) {
         const { endpoint, body, filters } = json;
         let query = knex(endpoint.entityId);
+        if (endpoint.schema) {
+            query = query.withSchema(endpoint.schema);
+        }
         const parsedBody = parseBody(body);
         query = this.addFilters(query, filters, { tableName: endpoint.entityId });
         // mysql can't use returning
@@ -320,6 +332,9 @@ class InternalBuilder {
     delete(knex, json, opts) {
         const { endpoint, filters } = json;
         let query = knex(endpoint.entityId);
+        if (endpoint.schema) {
+            query = query.withSchema(endpoint.schema);
+        }
         query = this.addFilters(query, filters, { tableName: endpoint.entityId });
         // mysql can't use returning
         if (opts.disableReturning) {

package/dist/integrations/base/sqlTable.js

@@ -87,17 +87,17 @@ function generateSchema(schema, table, tables, oldTable = null) {
     return schema;
 }
 function buildCreateTable(knex, table, tables) {
-    return knex.schema.createTable(table.name, schema => {
+    return knex.createTable(table.name, schema => {
         generateSchema(schema, table, tables);
     });
 }
 function buildUpdateTable(knex, table, tables, oldTable) {
-    return knex.schema.alterTable(table.name, schema => {
+    return knex.alterTable(table.name, schema => {
         generateSchema(schema, table, tables, oldTable);
     });
 }
 function buildDeleteTable(knex, table) {
-    return knex.schema.dropTable(table.name);
+    return knex.dropTable(table.name);
 }
 class SqlTableQueryBuilder {
     // pass through client to get flavour of SQL
@@ -115,7 +115,11 @@ class SqlTableQueryBuilder {
         return json.endpoint.operation;
     }
     _tableQuery(json) {
-        const client = knex_1.knex({ client: this.sqlClient });
+        var _a;
+        let client = knex_1.knex({ client: this.sqlClient }).schema;
+        if ((_a = json === null || json === void 0 ? void 0 : json.endpoint) === null || _a === void 0 ? void 0 : _a.schema) {
+            client = client.withSchema(json.endpoint.schema);
+        }
         let query;
         if (!json.table || !json.meta || !json.meta.tables) {
             throw "Cannot execute without table being specified";

package/dist/integrations/microsoftSqlServer.js

@@ -15,6 +15,7 @@ var MSSQLModule;
 (function (MSSQLModule) {
     const sqlServer = require("mssql");
     const Sql = require("./base/sql");
+    const DEFAULT_SCHEMA = "dbo";
     const SCHEMA = {
         docs: "https://github.com/tediousjs/node-mssql",
         plus: true,
@@ -43,6 +44,10 @@ var MSSQLModule;
                 type: datasource_1.DatasourceFieldTypes.STRING,
                 default: "root",
             },
+            schema: {
+                type: datasource_1.DatasourceFieldTypes.STRING,
+                default: DEFAULT_SCHEMA,
+            },
             encrypt: {
                 type: datasource_1.DatasourceFieldTypes.BOOLEAN,
                 default: true,
@@ -87,6 +92,20 @@ var MSSQLModule;
                 this.pool = new sqlServer.ConnectionPool(clientCfg);
             }
         }
+        getBindingIdentifier() {
+            return `(@p${this.index++})`;
+        }
+        connect() {
+            return __awaiter(this, void 0, void 0, function* () {
+                try {
+                    this.client = yield this.pool.connect();
+                }
+                catch (err) {
+                    // @ts-ignore
+                    throw new Error(err);
+                }
+            });
+        }
         internalQuery(query, operation = undefined) {
             return __awaiter(this, void 0, void 0, function* () {
                 const client = this.client;
@@ -137,20 +156,6 @@ var MSSQLModule;
               FROM INFORMATION_SCHEMA.COLUMNS
               WHERE TABLE_NAME='${tableName}'`;
         }
-        getBindingIdentifier() {
-            return `(@p${this.index++})`;
-        }
-        connect() {
-            return __awaiter(this, void 0, void 0, function* () {
-                try {
-                    this.client = yield this.pool.connect();
-                }
-                catch (err) {
-                    // @ts-ignore
-                    throw new Error(err);
-                }
-            });
-        }
         runSQL(sql) {
             return __awaiter(this, void 0, void 0, function* () {
                 return (yield this.internalQuery(utils_1.getSqlQuery(sql))).recordset;
@@ -164,11 +169,13 @@ var MSSQLModule;
         buildSchema(datasourceId, entities) {
             return __awaiter(this, void 0, void 0, function* () {
                 yield this.connect();
-                let tableNames = yield this.runSQL(this.TABLES_SQL);
-                if (tableNames == null || !Array.isArray(tableNames)) {
+                let tableInfo = yield this.runSQL(this.TABLES_SQL);
+                if (tableInfo == null || !Array.isArray(tableInfo)) {
                     throw "Unable to get list of tables in database";
                 }
-                tableNames = tableNames
+                const schema = this.config.schema || DEFAULT_SCHEMA;
+                const tableNames = tableInfo
+                    .filter((record) => record.TABLE_SCHEMA === schema)
                     .map((record) => record.TABLE_NAME)
                     .filter((name) => this.MASTER_TABLES.indexOf(name) === -1);
                 const tables = {};
@@ -240,7 +247,11 @@ var MSSQLModule;
         }
         query(json) {
             return __awaiter(this, void 0, void 0, function* () {
+                const schema = this.config.schema;
                 yield this.connect();
+                if (schema && schema !== DEFAULT_SCHEMA && (json === null || json === void 0 ? void 0 : json.endpoint)) {
+                    json.endpoint.schema = schema;
+                }
                 const operation = this._operation(json);
                 const queryFn = (query, op) => this.internalQuery(query, op);
                 const processFn = (result) => result.recordset ? result.recordset : [{ [operation]: true }];

package/dist/integrations/utils.js

@@ -6,36 +6,53 @@ const utils_1 = require("../db/utils");
 const constants_1 = require("../constants");
 const DOUBLE_SEPARATOR = `${utils_1.SEPARATOR}${utils_1.SEPARATOR}`;
 const ROW_ID_REGEX = /^\[.*]$/g;
-const SQL_TYPE_MAP = {
-    text: constants_1.FieldTypes.LONGFORM,
-    varchar: constants_1.FieldTypes.STRING,
+const SQL_NUMBER_TYPE_MAP = {
     integer: constants_1.FieldTypes.NUMBER,
+    int: constants_1.FieldTypes.NUMBER,
     bigint: constants_1.FieldTypes.NUMBER,
     decimal: constants_1.FieldTypes.NUMBER,
     smallint: constants_1.FieldTypes.NUMBER,
     real: constants_1.FieldTypes.NUMBER,
-    "double precision": constants_1.FieldTypes.NUMBER,
-    timestamp: constants_1.FieldTypes.DATETIME,
-    time: constants_1.FieldTypes.DATETIME,
-    boolean: constants_1.FieldTypes.BOOLEAN,
-    json: constants_1.FieldTypes.JSON,
-    date: constants_1.FieldTypes.DATETIME,
-    blob: constants_1.FieldTypes.LONGFORM,
-    enum: constants_1.FieldTypes.STRING,
     float: constants_1.FieldTypes.NUMBER,
-    int: constants_1.FieldTypes.NUMBER,
     numeric: constants_1.FieldTypes.NUMBER,
     mediumint: constants_1.FieldTypes.NUMBER,
     dec: constants_1.FieldTypes.NUMBER,
     double: constants_1.FieldTypes.NUMBER,
     fixed: constants_1.FieldTypes.NUMBER,
-    datetime: constants_1.FieldTypes.DATETIME,
-    tinyint: constants_1.FieldTypes.BOOLEAN,
-    long: constants_1.FieldTypes.LONGFORM,
+    "double precision": constants_1.FieldTypes.NUMBER,
     number: constants_1.FieldTypes.NUMBER,
     binary_float: constants_1.FieldTypes.NUMBER,
     binary_double: constants_1.FieldTypes.NUMBER,
+    money: constants_1.FieldTypes.NUMBER,
+    smallmoney: constants_1.FieldTypes.NUMBER,
+};
+const SQL_DATE_TYPE_MAP = {
+    timestamp: constants_1.FieldTypes.DATETIME,
+    time: constants_1.FieldTypes.DATETIME,
+    datetime: constants_1.FieldTypes.DATETIME,
+    smalldatetime: constants_1.FieldTypes.DATETIME,
+    date: constants_1.FieldTypes.DATETIME,
+};
+const SQL_STRING_TYPE_MAP = {
+    varchar: constants_1.FieldTypes.STRING,
+    char: constants_1.FieldTypes.STRING,
+    nchar: constants_1.FieldTypes.STRING,
+    nvarchar: constants_1.FieldTypes.STRING,
+    ntext: constants_1.FieldTypes.STRING,
+    enum: constants_1.FieldTypes.STRING,
+    blob: constants_1.FieldTypes.LONGFORM,
+    long: constants_1.FieldTypes.LONGFORM,
+    text: constants_1.FieldTypes.LONGFORM,
+};
+const SQL_BOOLEAN_TYPE_MAP = {
+    boolean: constants_1.FieldTypes.BOOLEAN,
+    bit: constants_1.FieldTypes.BOOLEAN,
+    tinyint: constants_1.FieldTypes.BOOLEAN,
+};
+const SQL_MISC_TYPE_MAP = {
+    json: constants_1.FieldTypes.JSON,
 };
+const SQL_TYPE_MAP = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, SQL_NUMBER_TYPE_MAP), SQL_DATE_TYPE_MAP), SQL_STRING_TYPE_MAP), SQL_BOOLEAN_TYPE_MAP), SQL_MISC_TYPE_MAP);
 var SqlClients;
 (function (SqlClients) {
     SqlClients["MS_SQL"] = "mssql";

package/dist/package.json

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