Ylianst/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2024-11-26 16:06:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

Include dbname in mysql/mariadb connectionObj

Browse Source
This commit is contained in:
Noah Zalev 2021-04-22 17:14:31 -04:00
parent 8674f8eb02
commit 4c34797915
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
db.js
View File

@ -439,13 +439,24 @@ module.exports.CreateDB = function (parent, func) {
} }
if (parent.args.mariadb || parent.args.mysql) { if (parent.args.mariadb || parent.args.mysql) {
var connectinArgs = (parent.args.mariadb) ? parent.args.mariadb : parent.args.mysql;
var connectionObject = {
'host': connectinArgs.host,
'port': connectinArgs.port,
'user': connectinArgs.user,
'password': connectinArgs.password,
'connectionLimit': null,
'database': null
};
if (connectinArgs.connectionLimit != null) connectionObject.connectionLimit = connectinArgs.connectionLimit;
connectionObject.database = (connectinArgs.database != null) ? connectinArgs.database : 'meshcentral';
if (parent.args.mariadb) { if (parent.args.mariadb) {
// Use MariaDB // Use MariaDB
obj.databaseType = 4; obj.databaseType = 4;
Datastore = require('mariadb').createPool(parent.args.mariadb); Datastore = require('mariadb').createPool(connectionObject);
} else if (parent.args.mysql) { } else if (parent.args.mysql) {
// Use MySQL // Use MySQL
Datastore = require('mysql').createConnection(parent.args.mysql); Datastore = require('mysql').createConnection(connectionObject);
obj.databaseType = 5; obj.databaseType = 5;
} }
//sqlDbQuery('DROP DATABASE MeshCentral', null, function (err, docs) { console.log('DROP'); }); return; //sqlDbQuery('DROP DATABASE MeshCentral', null, function (err, docs) { console.log('DROP'); }); return;