@budibase/server 1.0.135 → 1.0.138

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

@@ -307,7 +307,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" rel="noopener noreferrer">istanbul</a>
-                at Tue May 03 2022 13:54:07 GMT+0000 (Coordinated Universal Time)
+                at Tue May 03 2022 16:38:20 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

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

@@ -124,7 +124,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" rel="noopener noreferrer">istanbul</a>
-                at Tue May 03 2022 13:54:07 GMT+0000 (Coordinated Universal Time)
+                at Tue May 03 2022 16:38:20 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

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

@@ -142,7 +142,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" rel="noopener noreferrer">istanbul</a>
-                at Tue May 03 2022 13:54:07 GMT+0000 (Coordinated Universal Time)
+                at Tue May 03 2022 16:38:20 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../prettify.js"></script>
         <script>

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

@@ -487,7 +487,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" rel="noopener noreferrer">istanbul</a>
-                at Tue May 03 2022 13:54:07 GMT+0000 (Coordinated Universal Time)
+                at Tue May 03 2022 16:38:20 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../prettify.js"></script>
         <script>

package/coverage/lcov.info

@@ -6522,10 +6522,8 @@ FN:99,(anonymous_6)
 FN:222,(anonymous_7)
 FN:287,(anonymous_8)
 FN:289,(anonymous_9)
-FN:296,(anonymous_10)
-FN:299,(anonymous_11)
-FNF:12
-FNH:10
+FNF:10
+FNH:9
 FNDA:6,(anonymous_0)
 FNDA:6,(anonymous_1)
 FNDA:5,(anonymous_2)
@@ -6536,8 +6534,6 @@ FNDA:6,(anonymous_6)
 FNDA:5,(anonymous_7)
 FNDA:6,(anonymous_8)
 FNDA:6,(anonymous_9)
-FNDA:6,(anonymous_10)
-FNDA:0,(anonymous_11)
 DA:1,3
 DA:2,3
 DA:3,3
@@ -6590,7 +6586,9 @@ DA:92,0
 DA:100,6
 DA:101,6
 DA:102,6
+DA:103,6
 DA:105,6
+DA:106,6
 DA:107,6
 DA:108,6
 DA:109,5
@@ -6668,10 +6666,11 @@ DA:288,6
 DA:289,6
 DA:290,6
 DA:294,6
-DA:297,6
-DA:300,0
-LF:132
-LH:79
+DA:295,6
+DA:296,6
+DA:298,0
+LF:135
+LH:82
 BRDA:26,0,0,0
 BRDA:28,1,0,4
 BRDA:28,1,1,2
@@ -6745,10 +6744,8 @@ FN:162,(anonymous_7)
 FN:171,(anonymous_8)
 FN:193,(anonymous_9)
 FN:194,(anonymous_10)
-FN:197,(anonymous_11)
-FN:200,(anonymous_12)
-FNF:13
-FNH:12
+FNF:11
+FNH:10
 FNDA:15,(anonymous_0)
 FNDA:16,(anonymous_1)
 FNDA:13,(anonymous_2)
@@ -6760,8 +6757,6 @@ FNDA:6,(anonymous_7)
 FNDA:6,(anonymous_8)
 FNDA:10,(anonymous_9)
 FNDA:10,(anonymous_10)
-FNDA:8,(anonymous_11)
-FNDA:2,(anonymous_12)
 DA:1,2
 DA:2,2
 DA:3,2
@@ -6859,10 +6854,11 @@ DA:193,2
 DA:194,10
 DA:195,10
 DA:196,10
+DA:197,10
 DA:198,8
-DA:201,2
-LF:99
-LH:91
+DA:200,2
+LF:100
+LH:92
 BRDA:14,0,0,10
 BRDA:34,1,0,2
 BRDA:34,1,1,14

package/dist/integrations/microsoftSqlServer.js

@@ -201,12 +201,7 @@ var MSSQLModule;
                         if (typeof name !== "string") {
                             continue;
                         }
-                        const type = (0, utils_1.convertSqlType)(def.DATA_TYPE);
-                        schema[name] = {
-                            autocolumn: !!autoColumns.find((col) => col === name),
-                            name: name,
-                            type,
-                        };
+                        schema[name] = Object.assign({ autocolumn: !!autoColumns.find((col) => col === name), name: name }, (0, utils_1.convertSqlType)(def.DATA_TYPE));
                     }
                     tables[tableName] = {
                         _id: (0, utils_1.buildExternalTableId)(datasourceId, tableName),

package/dist/integrations/mysql.js

@@ -88,7 +88,7 @@ var MySQLModule;
             }
             // if not a number, see if it is a date - important to do in this order as any
             // integer will be considered a valid date
-            else if ((0, dayjs_1.default)(binding).isValid()) {
+            else if (/^\d/.test(binding) && (0, dayjs_1.default)(binding).isValid()) {
                 bindings[i] = (0, dayjs_1.default)(binding).toDate();
             }
         }
@@ -129,18 +129,25 @@ var MySQLModule;
                 yield this.client.end();
             });
         }
-        internalQuery(query, connect = true) {
+        internalQuery(query, opts = {
+            connect: true,
+            disableCoercion: false,
+        }) {
             return __awaiter(this, void 0, void 0, function* () {
                 try {
-                    if (connect) {
+                    if (opts === null || opts === void 0 ? void 0 : opts.connect) {
                         yield this.connect();
                     }
+                    const baseBindings = query.bindings || [];
+                    const bindings = (opts === null || opts === void 0 ? void 0 : opts.disableCoercion)
+                        ? baseBindings
+                        : bindingTypeCoerce(baseBindings);
                     // Node MySQL is callback based, so we must wrap our call in a promise
-                    const response = yield this.client.query(query.sql, bindingTypeCoerce(query.bindings || []));
+                    const response = yield this.client.query(query.sql, bindings);
                     return response[0];
                 }
                 finally {
-                    if (connect) {
+                    if (opts === null || opts === void 0 ? void 0 : opts.connect) {
                         yield this.disconnect();
                     }
                 }
@@ -153,13 +160,13 @@ var MySQLModule;
                 yield this.connect();
                 try {
                     // get the tables first
-                    const tablesResp = yield this.internalQuery({ sql: "SHOW TABLES;" }, false);
+                    const tablesResp = yield this.internalQuery({ sql: "SHOW TABLES;" }, { connect: 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);
+                        const descResp = yield this.internalQuery({ sql: `DESCRIBE \`${tableName}\`;` }, { connect: false });
                         for (let column of descResp) {
                             const columnName = column.Field;
                             if (column.Key === "PRI" &&
@@ -172,12 +179,7 @@ var MySQLModule;
                             const isAuto = typeof column.Extra === "string" &&
                                 (column.Extra === "auto_increment" ||
                                     column.Extra.toLowerCase().includes("generated"));
-                            schema[columnName] = {
-                                name: columnName,
-                                autocolumn: isAuto,
-                                type: (0, utils_1.convertSqlType)(column.Type),
-                                constraints,
-                            };
+                            schema[columnName] = Object.assign({ name: columnName, autocolumn: isAuto, constraints }, (0, utils_1.convertSqlType)(column.Type));
                         }
                         if (!tables[tableName]) {
                             tables[tableName] = {
@@ -224,7 +226,7 @@ var MySQLModule;
             return __awaiter(this, void 0, void 0, function* () {
                 yield this.connect();
                 try {
-                    const queryFn = (query) => this.internalQuery(query, false);
+                    const queryFn = (query) => this.internalQuery(query, { connect: false, disableCoercion: true });
                     return yield this.queryWithReturning(json, queryFn);
                 }
                 finally {

package/dist/integrations/oracle.js

@@ -202,7 +202,7 @@ var OracleModule;
         }
         internalConvertType(column) {
             if (this.isBooleanType(column)) {
-                return constants_1.FieldTypes.BOOLEAN;
+                return { type: constants_1.FieldTypes.BOOLEAN };
             }
             return (0, utils_1.convertSqlType)(column.type);
         }
@@ -240,11 +240,7 @@ var OracleModule;
                         const columnName = oracleColumn.name;
                         let fieldSchema = table.schema[columnName];
                         if (!fieldSchema) {
-                            fieldSchema = {
-                                autocolumn: OracleIntegration.isAutoColumn(oracleColumn),
-                                name: columnName,
-                                type: this.internalConvertType(oracleColumn),
-                            };
+                            fieldSchema = Object.assign({ autocolumn: OracleIntegration.isAutoColumn(oracleColumn), name: columnName }, this.internalConvertType(oracleColumn));
                             table.schema[columnName] = fieldSchema;
                         }
                         // iterate each constraint on the column

package/dist/integrations/postgres.js

@@ -190,7 +190,6 @@ var PostgresModule;
                             schema: {},
                         };
                     }
-                    const type = (0, utils_1.convertSqlType)(column.data_type);
                     const identity = !!(column.identity_generation ||
                         column.identity_start ||
                         column.identity_increment);
@@ -198,11 +197,7 @@ var PostgresModule;
                         column.column_default.startsWith("nextval");
                     const isGenerated = column.is_generated && column.is_generated !== "NEVER";
                     const isAuto = hasDefault || identity || isGenerated;
-                    tables[tableName].schema[columnName] = {
-                        autocolumn: isAuto,
-                        name: columnName,
-                        type,
-                    };
+                    tables[tableName].schema[columnName] = Object.assign({ autocolumn: isAuto, name: columnName }, (0, utils_1.convertSqlType)(column.data_type));
                 }
                 const final = (0, utils_1.finaliseExternalTables)(tables, entities);
                 this.tables = final.tables;

package/dist/integrations/utils.js

@@ -33,6 +33,8 @@ const SQL_DATE_TYPE_MAP = {
     smalldatetime: constants_1.FieldTypes.DATETIME,
     date: constants_1.FieldTypes.DATETIME,
 };
+const SQL_DATE_ONLY_TYPES = ["date"];
+const SQL_TIME_ONLY_TYPES = ["time"];
 const SQL_STRING_TYPE_MAP = {
     varchar: constants_1.FieldTypes.STRING,
     char: constants_1.FieldTypes.STRING,
@@ -73,9 +75,9 @@ function breakExternalTableId(tableId) {
         return {};
     }
     const parts = tableId.split(DOUBLE_SEPARATOR);
-    let tableName = parts.pop();
+    let datasourceId = parts.shift();
     // if they need joined
-    let datasourceId = parts.join(DOUBLE_SEPARATOR);
+    let tableName = parts.join(DOUBLE_SEPARATOR);
     return { datasourceId, tableName };
 }
 exports.breakExternalTableId = breakExternalTableId;
@@ -124,12 +126,20 @@ function breakRowIdField(_id) {
 }
 exports.breakRowIdField = breakRowIdField;
 function convertSqlType(type) {
+    let foundType = constants_1.FieldTypes.STRING;
+    const lcType = type.toLowerCase();
     for (let [external, internal] of Object.entries(SQL_TYPE_MAP)) {
-        if (type.toLowerCase().includes(external)) {
-            return internal;
+        if (lcType.includes(external)) {
+            foundType = internal;
+            break;
         }
     }
-    return constants_1.FieldTypes.STRING;
+    const schema = { type: foundType };
+    if (foundType === constants_1.FieldTypes.DATETIME) {
+        schema.dateOnly = SQL_DATE_ONLY_TYPES.includes(lcType);
+        schema.timeOnly = SQL_TIME_ONLY_TYPES.includes(lcType);
+    }
+    return schema;
 }
 exports.convertSqlType = convertSqlType;
 function getSqlQuery(query) {

package/dist/package.json

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

package/dist/threads/automation.js

@@ -100,9 +100,9 @@ class Orchestrator {
             let automation = this._automation;
             const app = yield this.getApp();
             let stopped = false;
-            let loopStep;
+            let loopStep = null;
             let stepCount = 0;
-            let loopStepNumber;
+            let loopStepNumber = null;
             let loopSteps = [];
             for (let step of automation.definition.steps) {
                 stepCount++;
@@ -249,15 +249,14 @@ class Orchestrator {
 }
 module.exports = (input, callback) => {
     const appId = input.data.event.appId;
-    doInAppContext(appId, () => {
+    doInAppContext(appId, () => __awaiter(void 0, void 0, void 0, function* () {
         const automationOrchestrator = new Orchestrator(input.data.automation, input.data.event);
-        automationOrchestrator
-            .execute()
-            .then(response => {
+        try {
+            const response = yield automationOrchestrator.execute();
             callback(null, response);
-        })
-            .catch(err => {
+        }
+        catch (err) {
             callback(err);
-        });
-    });
+        }
+    }));
 };

package/dist/threads/query.js

@@ -178,14 +178,14 @@ class QueryRunner {
     }
 }
 module.exports = (input, callback) => {
-    doInAppContext(input.appId, () => {
+    doInAppContext(input.appId, () => __awaiter(void 0, void 0, void 0, function* () {
         const Runner = new QueryRunner(input);
-        Runner.execute()
-            .then(response => {
+        try {
+            const response = yield Runner.execute();
             callback(null, response);
-        })
-            .catch(err => {
+        }
+        catch (err) {
             callback(err);
-        });
-    });
+        }
+    }));
 };