Fix backupconfig info (#7228)
- add missing postgresql info - properly handle new autobackup switch
PTR committed
Aug 11, 2025 at 19:14 UTC
2a9daae82e2c6fe75ef7239dda76ef451cbd5a50
1 file changed
+13
-8
db.js
+13
-8
@@ -933,7 +933,7 @@ module.exports.CreateDB = function (parent, func) {
933
connectinArgs.database = 'postgres';
934
DatastoreTest = new Client(connectinArgs);
935
DatastoreTest.connect();
936
-
936
+ connectinArgs.database = databaseName; //put the name back for backupconfig info
937
DatastoreTest.query('SELECT 1 FROM pg_catalog.pg_database WHERE datname = $1', [databaseName], function (err, res) { // check database exists first before creating
938
if (res.rowCount != 0) { // database exists now check tables exists
939
DatastoreTest.end();
@@ -3206,6 +3206,7 @@ module.exports.CreateDB = function (parent, func) {
3206
if (parent.args.mongodbname) { dbname = parent.args.mongodbname; }
3207
else if ((typeof parent.args.mariadb == 'object') && (typeof parent.args.mariadb.database == 'string')) { dbname = parent.args.mariadb.database; }
3208
else if ((typeof parent.args.mysql == 'object') && (typeof parent.args.mysql.database == 'string')) { dbname = parent.args.mysql.database; }
3209
+ else if ((typeof parent.args.postgres == 'object') && (typeof parent.args.postgres.database == 'string')) { dbname = parent.args.postgres.database; }
3210
else if (typeof parent.config.settings.sqlite3 == 'string') {dbname = parent.config.settings.sqlite3 + '.sqlite'};
3211
3212
const currentDate = new Date();
@@ -3214,18 +3215,17 @@ module.exports.CreateDB = function (parent, func) {
3215
3216
r += 'DB Name: ' + dbname + '\r\n';
3217
r += 'DB Type: ' + DB_LIST[obj.databaseType] + '\r\n';
3217
- r += 'BackupPath: ' + backupPath + '\r\n';
3218
- r += 'BackupFile: ' + obj.newAutoBackupFile + '.zip\r\n';
3218
3220
- if (parent.config.settings.autobackup == null) {
3221
- r += 'No Settings/AutoBackup\r\n';
3219
+ if (parent.config.settings.autobackup.backupintervalhours == -1) {
3220
+ r += 'Backup disabled\r\n';
3221
} else {
3222
+ r += 'BackupPath: ' + backupPath + '\r\n';
3223
+ r += 'BackupFile: ' + obj.newAutoBackupFile + '.zip\r\n';
3224
+
3225
if (parent.config.settings.autobackup.backuphour != null && parent.config.settings.autobackup.backuphour != -1) {
3226
r += 'Backup between: ' + parent.config.settings.autobackup.backuphour + 'H-' + (parent.config.settings.autobackup.backuphour + 1) + 'H\r\n';
3227
}
3226
- if (parent.config.settings.autobackup.backupintervalhours != null) {
3227
- r += 'Backup Interval (Hours): ' + parent.config.settings.autobackup.backupintervalhours + '\r\n';
3228
- }
3228
+ r += 'Backup Interval (Hours): ' + parent.config.settings.autobackup.backupintervalhours + '\r\n';
3229
if (parent.config.settings.autobackup.keeplastdaysbackup != null) {
3230
r += 'Keep Last Backups (Days): ' + parent.config.settings.autobackup.keeplastdaysbackup + '\r\n';
3231
}
@@ -3245,6 +3245,11 @@ module.exports.CreateDB = function (parent, func) {
3245
if (typeof parent.config.settings.autobackup.mysqldumppath != 'string') { r += 'Bad mysqldump type\r\n'; }
3246
else { r += parent.config.settings.autobackup.mysqldumppath + '\r\n'; }
3247
}
3248
+ if (parent.config.settings.autobackup.pgdumppath != null) {
3249
+ r += 'pgDump Path: ';
3250
+ if (typeof parent.config.settings.autobackup.pgdumppath != 'string') { r += 'Bad pgdump type\r\n'; }
3251
+ else { r += parent.config.settings.autobackup.pgdumppath + '\r\n'; }
3252
+ }
3253
if (parent.config.settings.autobackup.backupotherfolders) {
3254
r += 'Backup other folders: ';
3255
r += parent.filespath + ', ' + parent.recordpath + '\r\n';