MyFavMirrors/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2025-01-27 06:33:15 -05:00
Code Issues Packages Projects Releases Wiki Activity

use mysql2 package to support mysql8 (#5427)

Browse Source 
Signed-off-by: Simon Smith <simonsmith5521@gmail.com>
This commit is contained in:
Simon Smith 2023-10-21 01:30:57 +01:00 committed by GitHub
parent 58580beb96
commit e20a585b3a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
db.js
View File

@ -768,13 +768,13 @@ module.exports.CreateDB = function (parent, func) {
} else if (parent.args.mysql) { } else if (parent.args.mysql) {
// Use MySQL // Use MySQL
obj.databaseType = 5; obj.databaseType = 5;
var tempDatastore = require('mysql').createPool(connectionObject); var tempDatastore = require('mysql2').createPool(connectionObject);
tempDatastore.query('CREATE DATABASE IF NOT EXISTS ' + dbname, function (error) { tempDatastore.query('CREATE DATABASE IF NOT EXISTS ' + dbname, function (error) {
if (error != null) { if (error != null) {
console.log('Auto-create database failed: ' + error); console.log('Auto-create database failed: ' + error);
} }
connectionObject.database = dbname; connectionObject.database = dbname;
Datastore = require('mysql').createPool(connectionObject); Datastore = require('mysql2').createPool(connectionObject);
createTablesIfNotExist(dbname); createTablesIfNotExist(dbname);
}); });
setTimeout(function () { tempDatastore.end(); }, 2000); setTimeout(function () { tempDatastore.end(); }, 2000);
@ -1244,7 +1244,7 @@ module.exports.CreateDB = function (parent, func) {
var docs = []; var docs = [];
for (var i in results) { for (var i in results) {
if (results[i].doc) { if (results[i].doc) {
docs.push(JSON.parse(results[i].doc)); docs.push(results[i].doc);
} else if ((results.length == 1) && (results[i]['COUNT(doc)'] != null)) { } else if ((results.length == 1) && (results[i]['COUNT(doc)'] != null)) {
// This is a SELECT COUNT() operation // This is a SELECT COUNT() operation
docs = results[i]['COUNT(doc)']; docs = results[i]['COUNT(doc)'];
@ -1314,7 +1314,7 @@ module.exports.CreateDB = function (parent, func) {
.catch(function (err) { if (func) { try { func(err); } catch (ex) { console.log(ex); } } }); .catch(function (err) { if (func) { try { func(err); } catch (ex) { console.log(ex); } } });
} else if ((obj.databaseType == 5) || (obj.databaseType == 6)) { // MySQL } else if ((obj.databaseType == 5) || (obj.databaseType == 6)) { // MySQL
var Promises = []; var Promises = [];
for (var i in queries) { if (typeof queries[i] == 'string') { Promises.push(Datastore.query(queries[i])); } else { Promises.push(Datastore.query(queries[i][0], queries[i][1])); } } for (var i in queries) { if (typeof queries[i] == 'string') { Promises.push(Datastore.promise().query(queries[i])); } else { Promises.push(Datastore.promise().query(queries[i][0], queries[i][1])); } }
Promise.all(Promises) Promise.all(Promises)
.then(function (error, results, fields) { if (func) { try { func(error, results); } catch (ex) { console.log(ex); } } }) .then(function (error, results, fields) { if (func) { try { func(error, results); } catch (ex) { console.log(ex); } } })
.catch(function (error, results, fields) { if (func) { try { func(error); } catch (ex) { console.log(ex); } } }); .catch(function (error, results, fields) { if (func) { try { func(error); } catch (ex) { console.log(ex); } } });

2
meshcentral.js
View File

@ -4018,7 +4018,7 @@ function mainStart() {
if (sessionRecording == true) { modules.push('image-size'); } // Need to get the remote desktop JPEG sizes to index the recodring file. if (sessionRecording == true) { modules.push('image-size'); } // Need to get the remote desktop JPEG sizes to index the recodring file.
if (config.letsencrypt != null) { modules.push('acme-client@4.2.5'); } // Add acme-client module. We need to force v4.2.4 or higher since olver versions using SHA-1 which is no longer supported by Let's Encrypt. if (config.letsencrypt != null) { modules.push('acme-client@4.2.5'); } // Add acme-client module. We need to force v4.2.4 or higher since olver versions using SHA-1 which is no longer supported by Let's Encrypt.
if (config.settings.mqtt != null) { modules.push('aedes@0.39.0'); } // Add MQTT Modules if (config.settings.mqtt != null) { modules.push('aedes@0.39.0'); } // Add MQTT Modules
if (config.settings.mysql != null) { modules.push('mysql'); } // Add MySQL. if (config.settings.mysql != null) { modules.push('mysql2'); } // Add MySQL.
//if (config.settings.mysql != null) { modules.push('@mysql/xdevapi'); } // Add MySQL, official driver (https://dev.mysql.com/doc/dev/connector-nodejs/8.0/) //if (config.settings.mysql != null) { modules.push('@mysql/xdevapi'); } // Add MySQL, official driver (https://dev.mysql.com/doc/dev/connector-nodejs/8.0/)
if (config.settings.mongodb != null) { modules.push('mongodb@4.13.0'); modules.push('saslprep'); } // Add MongoDB, official driver. if (config.settings.mongodb != null) { modules.push('mongodb@4.13.0'); modules.push('saslprep'); } // Add MongoDB, official driver.
if (config.settings.postgres != null) { modules.push('pg@8.7.1'); modules.push('pgtools@0.3.2'); } // Add Postgres, Postgres driver. if (config.settings.postgres != null) { modules.push('pg@8.7.1'); modules.push('pgtools@0.3.2'); } // Add Postgres, Postgres driver.