@budibase/server 1.0.79-alpha.7 → 1.0.79-alpha.8

package/coverage/lcov.info

@@ -8254,205 +8254,228 @@ BRH:10
 end_of_record
 TN:
 SF:src/threads/query.js
-FN:9,(anonymous_0)
-FN:26,(anonymous_1)
-FN:88,(anonymous_2)
-FN:89,(anonymous_3)
-FN:102,(anonymous_4)
-FN:118,(anonymous_5)
-FN:136,(anonymous_6)
-FN:151,(anonymous_7)
-FN:160,(anonymous_8)
-FN:181,(anonymous_9)
-FN:223,(anonymous_10)
-FN:224,(anonymous_11)
-FN:227,(anonymous_12)
-FN:230,(anonymous_13)
-FNF:14
-FNH:13
+FN:13,(anonymous_0)
+FN:30,(anonymous_1)
+FN:48,(anonymous_2)
+FN:116,(anonymous_3)
+FN:117,(anonymous_4)
+FN:130,(anonymous_5)
+FN:146,(anonymous_6)
+FN:164,(anonymous_7)
+FN:179,(anonymous_8)
+FN:188,(anonymous_9)
+FN:209,(anonymous_10)
+FN:251,(anonymous_11)
+FN:252,(anonymous_12)
+FN:255,(anonymous_13)
+FN:258,(anonymous_14)
+FNF:15
+FNH:14
 FNDA:15,(anonymous_0)
-FNDA:16,(anonymous_1)
-FNDA:13,(anonymous_2)
-FNDA:0,(anonymous_3)
-FNDA:5,(anonymous_4)
-FNDA:6,(anonymous_5)
-FNDA:16,(anonymous_6)
-FNDA:6,(anonymous_7)
+FNDA:2,(anonymous_1)
+FNDA:16,(anonymous_2)
+FNDA:13,(anonymous_3)
+FNDA:0,(anonymous_4)
+FNDA:5,(anonymous_5)
+FNDA:6,(anonymous_6)
+FNDA:14,(anonymous_7)
 FNDA:6,(anonymous_8)
-FNDA:16,(anonymous_9)
-FNDA:10,(anonymous_10)
+FNDA:6,(anonymous_9)
+FNDA:12,(anonymous_10)
 FNDA:10,(anonymous_11)
-FNDA:8,(anonymous_12)
-FNDA:2,(anonymous_13)
+FNDA:10,(anonymous_12)
+FNDA:8,(anonymous_13)
+FNDA:2,(anonymous_14)
 DA:1,2
 DA:2,2
 DA:3,2
 DA:4,2
-DA:5,2
-DA:6,2
-DA:10,15
-DA:11,15
-DA:12,15
-DA:13,15
+DA:8,2
+DA:9,2
+DA:10,2
 DA:14,15
 DA:15,15
 DA:16,15
 DA:17,15
 DA:18,15
+DA:19,15
+DA:20,15
+DA:21,15
 DA:22,15
-DA:23,15
-DA:27,16
-DA:29,16
-DA:30,16
-DA:33,16
-DA:34,0
-DA:37,16
-DA:38,16
-DA:39,2
-DA:41,14
-DA:43,14
-DA:44,14
-DA:45,14
-DA:46,14
-DA:47,14
-DA:48,14
-DA:49,12
-DA:50,12
-DA:51,12
-DA:52,12
-DA:56,14
-DA:57,0
-DA:61,0
-DA:65,14
-DA:71,1
-DA:73,1
-DA:74,1
-DA:78,13
-DA:79,0
-DA:83,13
-DA:84,11
-DA:88,13
+DA:26,15
+DA:27,15
+DA:31,2
+DA:32,2
+DA:33,2
+DA:35,0
+DA:36,0
+DA:37,0
+DA:38,0
+DA:39,0
+DA:40,0
+DA:43,0
+DA:44,0
+DA:45,0
+DA:49,16
+DA:50,16
+DA:51,16
+DA:52,2
+DA:54,14
+DA:57,14
+DA:60,14
+DA:61,2
+DA:63,12
+DA:67,14
+DA:68,0
+DA:71,14
+DA:72,14
+DA:73,14
+DA:74,14
+DA:75,14
+DA:76,14
+DA:77,12
+DA:78,12
+DA:79,12
+DA:80,12
+DA:84,14
+DA:85,0
 DA:89,0
-DA:93,13
-DA:95,13
-DA:96,0
-DA:99,13
-DA:103,5
-DA:104,5
-DA:105,5
-DA:106,5
-DA:119,6
-DA:120,6
-DA:121,6
-DA:122,6
-DA:123,6
-DA:124,5
-DA:128,5
-DA:129,5
-DA:131,1
-DA:133,6
-DA:137,16
-DA:138,16
-DA:139,0
-DA:141,16
-DA:142,16
-DA:143,16
-DA:144,2
-DA:145,2
-DA:148,16
-DA:150,11
-DA:151,11
-DA:153,6
-DA:154,0
-DA:157,6
-DA:158,6
-DA:160,11
-DA:161,11
-DA:162,11
-DA:163,6
-DA:164,6
-DA:175,6
-DA:178,16
-DA:182,16
-DA:185,16
-DA:186,19
-DA:187,0
-DA:189,19
-DA:191,0
-DA:192,19
-DA:194,19
-DA:200,0
-DA:203,16
-DA:208,0
-DA:209,0
-DA:217,0
-DA:219,16
-DA:223,2
-DA:224,10
-DA:225,10
-DA:226,10
-DA:228,8
-DA:231,2
-LF:109
-LH:95
-BRDA:9,0,0,10
-BRDA:33,1,0,0
-BRDA:33,1,1,16
-BRDA:38,2,0,2
-BRDA:38,2,1,14
-BRDA:48,3,0,12
-BRDA:48,3,1,2
-BRDA:56,4,0,0
-BRDA:56,4,1,14
-BRDA:65,5,0,1
-BRDA:65,5,1,13
-BRDA:66,6,0,14
-BRDA:66,6,1,12
-BRDA:66,6,2,1
-BRDA:66,6,3,1
-BRDA:78,7,0,0
-BRDA:78,7,1,13
-BRDA:83,8,0,11
-BRDA:83,8,1,2
-BRDA:88,9,0,0
-BRDA:88,9,1,13
-BRDA:95,10,0,0
-BRDA:95,10,1,13
-BRDA:123,11,0,5
-BRDA:123,11,1,1
-BRDA:124,12,0,0
-BRDA:124,12,1,5
-BRDA:138,13,0,0
-BRDA:138,13,1,16
-BRDA:138,14,0,16
-BRDA:138,14,1,16
-BRDA:141,15,0,16
-BRDA:141,15,1,15
-BRDA:142,16,0,16
-BRDA:142,16,1,5
-BRDA:144,17,0,2
-BRDA:144,17,1,0
-BRDA:148,18,0,11
-BRDA:148,18,1,5
-BRDA:153,19,0,0
-BRDA:153,19,1,6
-BRDA:181,20,0,0
-BRDA:186,21,0,0
-BRDA:186,21,1,19
-BRDA:189,22,0,0
-BRDA:189,22,1,19
-BRDA:192,23,0,19
-BRDA:192,23,1,0
-BRDA:203,24,0,0
-BRDA:203,24,1,16
-BRDA:204,25,0,16
-BRDA:204,25,1,16
-BRDA:204,25,2,16
-BRDA:210,26,0,0
-BRDA:210,26,1,0
-BRDA:210,26,2,0
-BRF:56
-BRH:39
+DA:93,14
+DA:99,1
+DA:101,1
+DA:102,1
+DA:106,13
+DA:107,0
+DA:111,13
+DA:112,11
+DA:116,13
+DA:117,0
+DA:121,13
+DA:123,13
+DA:124,0
+DA:127,13
+DA:131,5
+DA:132,5
+DA:133,5
+DA:134,5
+DA:147,6
+DA:148,6
+DA:149,6
+DA:150,6
+DA:151,6
+DA:152,5
+DA:156,5
+DA:157,5
+DA:159,1
+DA:161,6
+DA:165,14
+DA:166,14
+DA:167,0
+DA:169,14
+DA:170,14
+DA:171,14
+DA:172,2
+DA:173,2
+DA:176,14
+DA:178,9
+DA:179,9
+DA:181,6
+DA:182,0
+DA:185,6
+DA:186,6
+DA:188,9
+DA:189,9
+DA:190,9
+DA:191,6
+DA:192,6
+DA:203,6
+DA:206,14
+DA:210,12
+DA:213,12
+DA:214,19
+DA:215,0
+DA:217,19
+DA:219,0
+DA:220,19
+DA:222,19
+DA:228,0
+DA:231,12
+DA:236,0
+DA:237,0
+DA:245,0
+DA:247,12
+DA:251,2
+DA:252,10
+DA:253,10
+DA:254,10
+DA:256,8
+DA:259,2
+LF:124
+LH:101
+BRDA:13,0,0,10
+BRDA:32,1,0,2
+BRDA:32,1,1,0
+BRDA:51,2,0,2
+BRDA:51,2,1,14
+BRDA:60,3,0,2
+BRDA:60,3,1,12
+BRDA:67,4,0,0
+BRDA:67,4,1,14
+BRDA:76,5,0,12
+BRDA:76,5,1,2
+BRDA:84,6,0,0
+BRDA:84,6,1,14
+BRDA:93,7,0,1
+BRDA:93,7,1,13
+BRDA:94,8,0,14
+BRDA:94,8,1,12
+BRDA:94,8,2,1
+BRDA:94,8,3,1
+BRDA:106,9,0,0
+BRDA:106,9,1,13
+BRDA:111,10,0,11
+BRDA:111,10,1,2
+BRDA:116,11,0,0
+BRDA:116,11,1,13
+BRDA:123,12,0,0
+BRDA:123,12,1,13
+BRDA:151,13,0,5
+BRDA:151,13,1,1
+BRDA:152,14,0,0
+BRDA:152,14,1,5
+BRDA:166,15,0,0
+BRDA:166,15,1,14
+BRDA:166,16,0,14
+BRDA:166,16,1,14
+BRDA:169,17,0,14
+BRDA:169,17,1,13
+BRDA:170,18,0,14
+BRDA:170,18,1,3
+BRDA:172,19,0,2
+BRDA:172,19,1,0
+BRDA:176,20,0,9
+BRDA:176,20,1,5
+BRDA:181,21,0,0
+BRDA:181,21,1,6
+BRDA:209,22,0,0
+BRDA:210,23,0,0
+BRDA:210,23,1,12
+BRDA:214,24,0,0
+BRDA:214,24,1,19
+BRDA:217,25,0,0
+BRDA:217,25,1,19
+BRDA:220,26,0,19
+BRDA:220,26,1,0
+BRDA:231,27,0,0
+BRDA:231,27,1,12
+BRDA:232,28,0,12
+BRDA:232,28,1,12
+BRDA:232,28,2,12
+BRDA:238,29,0,0
+BRDA:238,29,1,0
+BRDA:238,29,2,0
+BRF:62
+BRH:43
 end_of_record
 TN:
 SF:src/threads/utils.js

package/dist/integrations/googlesheets.js

@@ -97,6 +97,9 @@ var GoogleSheetsModule;
             const spreadsheetId = this.cleanSpreadsheetUrl(this.config.spreadsheetId);
             this.client = new google_spreadsheet_1.GoogleSpreadsheet(spreadsheetId);
         }
+        getBindingIdentifier() {
+            return "";
+        }
         /**
          * Pull the spreadsheet ID out from a valid google sheets URL
          * @param spreadsheetId - the URL or standard spreadsheetId of the google sheet

package/dist/integrations/microsoftSqlServer.js

@@ -63,32 +63,10 @@ var MSSQLModule;
             },
         },
     };
-    function internalQuery(client, query, operation = undefined) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const request = client.request();
-            try {
-                if (Array.isArray(query.bindings)) {
-                    let count = 0;
-                    for (let binding of query.bindings) {
-                        request.input(`p${count++}`, binding);
-                    }
-                }
-                // this is a hack to get the inserted ID back,
-                //  no way to do this with Knex nicely
-                const sql = operation === datasource_1.Operation.CREATE
-                    ? `${query.sql}; SELECT SCOPE_IDENTITY() AS id;`
-                    : query.sql;
-                return yield request.query(sql);
-            }
-            catch (err) {
-                // @ts-ignore
-                throw new Error(err);
-            }
-        });
-    }
     class SqlServerIntegration extends Sql {
         constructor(config) {
             super(utils_1.SqlClients.MS_SQL);
+            this.index = 0;
             this.tables = {};
             this.schemaErrors = {};
             this.MASTER_TABLES = [
@@ -109,6 +87,31 @@ var MSSQLModule;
                 this.pool = new sqlServer.ConnectionPool(clientCfg);
             }
         }
+        internalQuery(query, operation = undefined) {
+            return __awaiter(this, void 0, void 0, function* () {
+                const client = this.client;
+                const request = client.request();
+                this.index = 0;
+                try {
+                    if (Array.isArray(query.bindings)) {
+                        let count = 0;
+                        for (let binding of query.bindings) {
+                            request.input(`p${count++}`, binding);
+                        }
+                    }
+                    // this is a hack to get the inserted ID back,
+                    //  no way to do this with Knex nicely
+                    const sql = operation === datasource_1.Operation.CREATE
+                        ? `${query.sql}; SELECT SCOPE_IDENTITY() AS id;`
+                        : query.sql;
+                    return yield request.query(sql);
+                }
+                catch (err) {
+                    // @ts-ignore
+                    throw new Error(err);
+                }
+            });
+        }
         getDefinitionSQL(tableName) {
             return `select *
               from INFORMATION_SCHEMA.COLUMNS
@@ -134,6 +137,9 @@ 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 {
@@ -147,7 +153,7 @@ var MSSQLModule;
         }
         runSQL(sql) {
             return __awaiter(this, void 0, void 0, function* () {
-                return (yield internalQuery(this.client, utils_1.getSqlQuery(sql))).recordset;
+                return (yield this.internalQuery(utils_1.getSqlQuery(sql))).recordset;
             });
         }
         /**
@@ -207,28 +213,28 @@ var MSSQLModule;
         read(query) {
             return __awaiter(this, void 0, void 0, function* () {
                 yield this.connect();
-                const response = yield internalQuery(this.client, utils_1.getSqlQuery(query));
+                const response = yield this.internalQuery(utils_1.getSqlQuery(query));
                 return response.recordset;
             });
         }
         create(query) {
             return __awaiter(this, void 0, void 0, function* () {
                 yield this.connect();
-                const response = yield internalQuery(this.client, utils_1.getSqlQuery(query));
+                const response = yield this.internalQuery(utils_1.getSqlQuery(query));
                 return response.recordset || [{ created: true }];
             });
         }
         update(query) {
             return __awaiter(this, void 0, void 0, function* () {
                 yield this.connect();
-                const response = yield internalQuery(this.client, utils_1.getSqlQuery(query));
+                const response = yield this.internalQuery(utils_1.getSqlQuery(query));
                 return response.recordset || [{ updated: true }];
             });
         }
         delete(query) {
             return __awaiter(this, void 0, void 0, function* () {
                 yield this.connect();
-                const response = yield internalQuery(this.client, utils_1.getSqlQuery(query));
+                const response = yield this.internalQuery(utils_1.getSqlQuery(query));
                 return response.recordset || [{ deleted: true }];
             });
         }
@@ -236,7 +242,7 @@ var MSSQLModule;
             return __awaiter(this, void 0, void 0, function* () {
                 yield this.connect();
                 const operation = this._operation(json);
-                const queryFn = (query, op) => internalQuery(this.client, query, op);
+                const queryFn = (query, op) => this.internalQuery(query, op);
                 const processFn = (result) => result.recordset ? result.recordset : [{ [operation]: true }];
                 return this.queryWithReturning(json, queryFn, processFn);
             });

package/dist/integrations/mysql.js

@@ -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);
@@ -95,19 +76,42 @@ var MySQLModule;
             }
             this.client = mysql.createConnection(config);
         }
+        getBindingIdentifier() {
+            return "?";
+        }
+        internalQuery(query, connect = true) {
+            const client = this.client;
+            // 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();
+                    }
+                });
+            });
+        }
         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 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 internalQuery(this.client, { sql: `DESCRIBE \`${tableName}\`;` }, false);
+                    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) {
@@ -143,31 +147,31 @@ 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 queryFn = (query) => this.internalQuery(query, false);
                 const output = yield this.queryWithReturning(json, queryFn);
                 this.client.end();
                 return output;