Ylianst/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2024-10-26 09:59:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

check db exists first before creating in postgres (#5968)

Browse Source 
Signed-off-by: si458 <simonsmith5521@gmail.com>
This commit is contained in:
Simon Smith 2024-03-31 19:20:15 +01:00 committed by GitHub
parent 8e8cc4b327
commit 102489447d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
db.js
View File

@ -785,20 +785,28 @@ module.exports.CreateDB = function (parent, func) {
var dbname = (connectinArgs.database != null) ? connectinArgs.database : 'meshcentral'; var dbname = (connectinArgs.database != null) ? connectinArgs.database : 'meshcentral';
delete connectinArgs.database; delete connectinArgs.database;
obj.databaseType = 6; obj.databaseType = 6;
const pgtools = require('pgtools'); const { Pool, Client } = require('pg');
pgtools.createdb(connectinArgs, dbname, function (err, res) { connectinArgs.database = dbname;
const { Pool, Client } = require('pg'); Datastore = new Client(connectinArgs);
connectinArgs.database = dbname; Datastore.connect();
Datastore = new Client(connectinArgs); sqlDbQuery('SELECT 1 FROM pg_database WHERE datname = $1', [dbname], function (dberr, dbdocs) { // check database exists first before creating
Datastore.connect(); if (dberr == null) { // database exists now check tables exists
if (err == null) {
// Create the tables and indexes
postgreSqlCreateTables(func);
} else {
// Database already existed, perform a test query to see if the main table is present
sqlDbQuery('SELECT doc FROM main WHERE id = $1', ['DatabaseIdentifier'], function (err, docs) { sqlDbQuery('SELECT doc FROM main WHERE id = $1', ['DatabaseIdentifier'], function (err, docs) {
if (err == null) { setupFunctions(func); } else { postgreSqlCreateTables(func); } // If not present, create the tables and indexes if (err == null) { setupFunctions(func); } else { postgreSqlCreateTables(func); } // If not present, create the tables and indexes
}); });
} else { // If not present, create the tables and indexes
const pgtools = require('pgtools');
pgtools.createdb(connectinArgs, dbname, function (err, res) {
if (err == null) {
// Create the tables and indexes
postgreSqlCreateTables(func);
} else {
// Database already existed, perform a test query to see if the main table is present
sqlDbQuery('SELECT doc FROM main WHERE id = $1', ['DatabaseIdentifier'], function (err, docs) {
if (err == null) { setupFunctions(func); } else { postgreSqlCreateTables(func); } // If not present, create the tables and indexes
});
}
});
} }
}); });
} else if (parent.args.mongodb) { } else if (parent.args.mongodb) {
@ -1260,7 +1268,6 @@ module.exports.CreateDB = function (parent, func) {
} else if (obj.databaseType == 6) { // Postgres SQL } else if (obj.databaseType == 6) { // Postgres SQL
Datastore.query(query, args, function (error, results) { Datastore.query(query, args, function (error, results) {
if (error != null) { if (error != null) {
console.log(query, args, error);
if (func) try { func(error); } catch (ex) { console.log('SQLERR4', ex); } if (func) try { func(error); } catch (ex) { console.log('SQLERR4', ex); }
} else { } else {
var docs = []; var docs = [];