7983-testToMaster_2438 #2977

Merged
alexm merged 212 commits from 7983-testToMaster_2438 into master 2024-09-17 05:36:47 +00:00
2 changed files with 8 additions and 1 deletions
Showing only changes of commit 9485434dc2 - Show all commits

View File

@ -342,6 +342,9 @@ exports.initialize = function initialize(dataSource, callback) {
}
};
// Code extracted from original Loopback MySQL connector
// since it cannot be reused, please try not to alter it.
// https://github.com/loopbackio/loopback-connector-mysql/blob/v6.2.0/lib/mysql.js
MySQL.prototype.connect = function(callback) {
const self = this;
const options = generateOptions(this.settings);

View File

@ -11,12 +11,16 @@
"port": "3306",
"username": "root",
"password": "root",
"connectionLimit": 100,
"queueLimit": 100,
"multipleStatements": true,
"legacyUtcDateProcessing": false,
"timezone": "local",
"connectTimeout": 40000,
"acquireTimeout": 90000,
"waitForConnections": true
"waitForConnections": true,
"maxIdleTime": 60000,
"idleTimeout": 60000
},
"osticket": {
"connector": "memory",