From 5b17a50b395ccb9f48c9e300fa392211513a0a3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emiliano=20Su=C3=B1=C3=A9?= <emiliano.sune@gmail.com>
Date: Thu, 16 Jan 2025 09:27:55 -0800
Subject: [PATCH] Removed backupSchema option until further development
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Emiliano Suñé <emiliano.sune@gmail.com>
---
 config/backup.conf            |  2 +-
 docker/backup.config.utils    |  6 ++++--
 docker/backup.postgres.plugin | 10 ++--------
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/config/backup.conf b/config/backup.conf
index 64e9e5d..80aa233 100644
--- a/config/backup.conf
+++ b/config/backup.conf
@@ -41,7 +41,7 @@
 # Full Example:
 # -----------------------------------------------------------
 # postgres=postgresql:5432/TheOrgBook_Database
-# postgres=postgresql:5432/mydb?backupSchema=my_schema&verifySchema=my_schema
+# postgres=postgresql:5432/mydb?verifySchema=my_schema
 # mongo=mender-mongodb:27017/useradm
 # postgres=wallet-db/tob_issuer
 # mssql=pims-db-dev:1433/pims
diff --git a/docker/backup.config.utils b/docker/backup.config.utils
index 29baad0..f92a037 100644
--- a/docker/backup.config.utils
+++ b/docker/backup.config.utils
@@ -13,11 +13,13 @@ function getDatabaseName(){
 function getSchema(){
   (
     _databaseSpec=${1}
-    _backupMode=${2:-'backup'}
+    _backupMode=${2:-'verify'}
     _schema=""
     
     if [ "${_backupMode}" == 'backup' ]; then
-      _schema=$(echo ${_databaseSpec} | sed -n  's~^.*backupSchema=\([^&]*\).*~\1~p')
+      # Currently not in use, needs more tweaks to be used.
+      # _schema=$(echo ${_databaseSpec} | sed -n  's~^.*backupSchema=\([^&]*\).*~\1~p')
+      echoYellow "Backing up only a specific schema is not supported yet."
     elif [ "${_backupMode}" == 'verify' ]; then
       _verifySchema=$(echo ${_databaseSpec} | sed -n  's~^.*verifySchema=\([^&]*\).*~\1~p')
       _schema="${_verifySchema:-$TABLE_SCHEMA}"      
diff --git a/docker/backup.postgres.plugin b/docker/backup.postgres.plugin
index 79c2d84..4dc61ea 100644
--- a/docker/backup.postgres.plugin
+++ b/docker/backup.postgres.plugin
@@ -21,21 +21,15 @@ function onBackupDatabase(){
 
     _hostname=$(getHostname ${_databaseSpec})
     _database=$(getDatabaseName ${_databaseSpec})
-    _schema=$(getSchema ${_databaseSpec} 'backup')
     _port=$(getPort ${_databaseSpec})
     _portArg=${_port:+"-p ${_port}"}
     _username=$(getUsername ${_databaseSpec})
     _password=$(getPassword ${_databaseSpec})
 
-    # Add schema to backup command, if specified
-    if [ ! -z "${_schema}" ]; then
-      _schemaLog="schema '${_schema}' in "
-      _schemaParam="-n ${_schema} "
-    fi
-    echoGreen "Backing up ${_schemaLog}'${_hostname}${_port:+:${_port}}${_database:+/${_database}}' to '${_backupFile}' ..."
+    echoGreen "Backing up '${_hostname}${_port:+:${_port}}${_database:+/${_database}}' to '${_backupFile}' ..."
 
     export PGPASSWORD=${_password}
-    pg_dump -Fp -h "${_hostname}" ${_portArg} -U "${_username}" "${_schemaParam}""${_database}" > "${BACKUP_DIR}backup.sql"
+    pg_dump -Fp -h "${_hostname}" ${_portArg} -U "${_username}" "${_database}" > "${BACKUP_DIR}backup.sql"
     pg_dumpall -h "${_hostname}" ${_portArg} -U "${_username}" --roles-only --no-role-passwords > "${BACKUP_DIR}roles.sql"
 
     # post-process roles.sql to remove the "CREATE ROLE" and "ALTER ROLE" statements for the default roles