pengjunjie/server
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/server.git synced 2026-02-10 18:05:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

[fix] Make closePool async; Bump nodejs version for mysql test; For bug 68194

Browse Source
This commit is contained in:
Sergey Konovalov
2024-06-03 13:07:33 +03:00
parent 8d401629c5
commit d779c08027
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/mysqlDatabaseTests.yml vendored
View File

@ -21,7 +21,7 @@ jobs:
- name: Caching dependencies
uses: actions/setup-node@v3
with:
node-version: '14'
node-version: '16'
cache: 'npm'
cache-dependency-path: |
./npm-shrinkwrap.json

10
DocService/sources/databaseConnectors/mysqlConnector.js
View File

@ -54,7 +54,7 @@ const connectionConfiguration = {
const additionalOptions = configSql.get('mysqlExtraOptions');
const configuration = Object.assign({}, connectionConfiguration, additionalOptions);
let pool = null;
let pool = mysql.createPool(configuration);
function sqlQuery(ctx, sqlCommand, callbackFunction, opt_noModifyRes = false, opt_noLog = false, opt_values = []) {
return executeQuery(ctx, sqlCommand, opt_values, opt_noModifyRes, opt_noLog).then(
@ -66,10 +66,6 @@ function sqlQuery(ctx, sqlCommand, callbackFunction, opt_noModifyRes = false, op
async function executeQuery(ctx, sqlCommand, values = [], noModifyRes = false, noLog = false) {
let connection = null;
try {
if (!pool) {
pool = mysql.createPool(configuration);
}
connection = await pool.getConnection();
const result = await connection.query(sqlCommand, values);
@ -102,8 +98,8 @@ async function executeQuery(ctx, sqlCommand, values = [], noModifyRes = false, n
}
}
function closePool() {
return pool?.end();
async function closePool() {
return await pool.end();
}
function addSqlParameter(parameter, accumulatedArray) {