From 86fca56c51555a12fea689a4050869fee0367c17 Mon Sep 17 00:00:00 2001
From: Alan Christie <alan.christie@matildapeak.com>
Date: Thu, 4 Jul 2024 17:39:48 +0100
Subject: [PATCH] feat: Another UNPACK_CMD fix

---
 sql-recovery/recovery.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sql-recovery/recovery.py b/sql-recovery/recovery.py
index 24fe968..caa3cc0 100755
--- a/sql-recovery/recovery.py
+++ b/sql-recovery/recovery.py
@@ -383,7 +383,8 @@ def error(error_no):
 #          database admin users must be the same.
 UNPACK_CMD = "gunzip -c %s" % BACKUP_FILE
 UNPACK_CMD += " | "
-UNPACK_CMD += "egrep -v \"(CREATE|DROP) ROLE IF EXISTS %s;" % PGUSER
+UNPACK_CMD += "egrep -v \"DROP ROLE IF EXISTS %s;" % PGUSER
+UNPACK_CMD += "|CREATE ROLE %s;" % PGUSER
 UNPACK_CMD += "|DROP DATABASE template1;"
 UNPACK_CMD += "|CREATE DATABASE template1 WITH TEMPLATE = template0 ENCODING = 'SQL_ASCII' LOCALE = 'C';\""
 UNPACK_CMD += " > %s/dumpall.sql" % RECOVERY_ROOT_DIR