diff --git a/databases.json b/databases.json index b4a4739..7eee925 100644 --- a/databases.json +++ b/databases.json @@ -8,9 +8,19 @@ "password": "changeme", "port": 5432, "host": "db-postgres", - "generated_id": "16678159-ff7e-4c97-8c83-0adeff214681", + "generated_id": "16678159-ff7e-4c97-8c83-0adeff214681" + }, + { + "name": "Test database 1 - PostgreSQL - BIS", + "database": "devdb2", + "type": "postgresql", + "username": "devuser2", + "password": "changeme2", + "port": 5432, + "host": "db-postgres-2", + "generated_id": "16678159-ff7e-5697-8c83-0adeff214681", "options": { - "keep_ownership": false + "keep_ownership": true } }, { diff --git a/docker-compose.databases.yml b/docker-compose.databases.yml index 0d551c9..9f13c3c 100644 --- a/docker-compose.databases.yml +++ b/docker-compose.databases.yml @@ -15,6 +15,20 @@ services: networks: - portabase + db-postgres-2: + container_name: db-postgres-2 + image: postgres:17-alpine + ports: + - "5438:5432" + volumes: + - postgres-data-2:/var/lib/postgresql/data + environment: + - POSTGRES_DB=devdb2 + - POSTGRES_USER=devuser2 + - POSTGRES_PASSWORD=changeme2 + networks: + - portabase + db-mariadb: container_name: db-mariadb image: mariadb:latest @@ -179,6 +193,7 @@ services: volumes: postgres-data: + postgres-data-2: mariadb-data: mysql-data: mongodb-data: diff --git a/src/domain/postgres/restore.rs b/src/domain/postgres/restore.rs index dd1e365..4dea741 100644 --- a/src/domain/postgres/restore.rs +++ b/src/domain/postgres/restore.rs @@ -46,6 +46,12 @@ pub async fn run( .and_then(|v| v.as_bool()) .unwrap_or(false); + if keep_ownership { + logger.log("info", format!("Restoring ownership and privileges for {}", cfg.name)); + } else { + logger.log("info", format!("Stripping ownership and privileges for {} (--no-owner --no-privileges)", cfg.name)); + } + match format { PostgresDumpFormat::Fc => { logger.log("info", format!("Running FC restore for {}", cfg.name));