Use of no-comments and exclude-database (pg_dumpall) (#8)

* fix: Fix recovery (s3 fuse)

* fix: Fix "current user cannot be dropped" on recovery

* fix: Fix recovery typo

* fix: Fix for IF EXISTS

* fix: Fix filter command

* fix: Remove sql.out on success

* fix: Backup now uses --no-comments and --exclude-database=

---------

Co-authored-by: a.b.christie <alan.christie@matildapeak.com>

Author: alanbchristie

sql-backup/backup.py

@@ -389,13 +389,16 @@
 # Backup commands (for all databases) for the various database flavours...
 BACKUP_COMMANDS = {
     FLAVOUR_POSTGRESQL: 'pg_dumpall --username=%s --no-password --clean --if-exists'
+                        ' --no-comments'
+                        ' --exclude-database=template1'
+                        ' --exclude-database=postgres'
                         ' | gzip > %s' % (PGUSER, BACKUP)
 }
 # Backup commands (for a single database).
 # Check comments above in case they're relevant here.
 BACKUP_COMMANDS_ONE_DB = {
-    FLAVOUR_POSTGRESQL: 'pg_dump --username=%s --no-password --clean --if-exists %s'
-                        ' | gzip > %s' % (PGUSER, DATABASE, BACKUP)
+    FLAVOUR_POSTGRESQL: 'pg_dump --username=%s --no-password --clean --if-exists'
+                        ' --no-comments %s | gzip > %s' % (PGUSER, DATABASE, BACKUP)
 }
 
 # What 'flavour' of database do we expect to be backing up?

sql-recovery/recovery.py

@@ -631,12 +631,16 @@ def error(error_no):
 # Remove any files we may have created.
 RECOVERY_FILE = "%s/%s.sql" % (RECOVERY_ROOT_DIR, DECOMPRESSED_RECOVERY_NAME)
 FILTERED_FILE = "%s/%s.sql" % (RECOVERY_ROOT_DIR, DECOMPRESSED_FILTERED_NAME)
+OUTPUT_FILE = "%s/sql.out" % RECOVERY_ROOT_DIR
 if os.path.isfile(RECOVERY_FILE):
     print('--] Removing %s' % RECOVERY_FILE)
     os.remove(RECOVERY_FILE)
 if os.path.isfile(FILTERED_FILE):
     print('--] Removing %s' % FILTERED_FILE)
     os.remove(FILTERED_FILE)
+if os.path.isfile(OUTPUT_FILE):
+    print('--] Removing %s' % OUTPUT_FILE)
+    os.remove(OUTPUT_FILE)
 
 # Success if we get here
 write_termination_message()