Include dbname in mysql/mariadb connectionObj
Noah Zalev committed
Apr 22, 2021 at 17:14 UTC
4c34797915359fa7e2028449e76d0bfd9fbeaa39
1 file changed
+13
-2
db.js
+13
-2
@@ -439,13 +439,24 @@ module.exports.CreateDB = function (parent, func) {
439
}
440
441
if (parent.args.mariadb || parent.args.mysql) {
442
+ var connectinArgs = (parent.args.mariadb) ? parent.args.mariadb : parent.args.mysql;
443
+ var connectionObject = {
444
+ 'host': connectinArgs.host,
445
+ 'port': connectinArgs.port,
446
+ 'user': connectinArgs.user,
447
+ 'password': connectinArgs.password,
448
+ 'connectionLimit': null,
449
+ 'database': null
450
+ };
451
+ if (connectinArgs.connectionLimit != null) connectionObject.connectionLimit = connectinArgs.connectionLimit;
452
+ connectionObject.database = (connectinArgs.database != null) ? connectinArgs.database : 'meshcentral';
453
if (parent.args.mariadb) {
454
// Use MariaDB
455
obj.databaseType = 4;
445
- Datastore = require('mariadb').createPool(parent.args.mariadb);
456
+ Datastore = require('mariadb').createPool(connectionObject);
457
} else if (parent.args.mysql) {
458
// Use MySQL
448
- Datastore = require('mysql').createConnection(parent.args.mysql);
459
+ Datastore = require('mysql').createConnection(connectionObject);
460
obj.databaseType = 5;
461
}
462
//sqlDbQuery('DROP DATABASE MeshCentral', null, function (err, docs) { console.log('DROP'); }); return;