Skip to content
This repository was archived by the owner on Dec 5, 2025. It is now read-only.

refactor: Update database name handling in restore processes #48

Merged
Tvion merged 1 commit into from
Oct 23, 2025
Merged

refactor: Update database name handling in restore processes #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docker/granular/backups.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -534,7 +534,7 @@ def transform_restore_status_v1(raw: dict) -> dict:
info = info or {}
out["databases"].append({
"previousDatabaseName": prev_name,
"databaseName": info.get("databaseName") or info.get("restoredAs") or prev_name,
"databaseName": info.get("newDatabaseName") or info.get("databaseName") or info.get("restoredAs") or prev_name,
"status": info.get("status"),
"duration": info.get("duration"),
"path": info.get("path"),
Expand Down
6 changes: 3 additions & 3 deletions docker/granular/granular.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1425,9 +1425,9 @@ def post(self, backup_id):
"created": created_iso,
"creationTime": created_iso,
"completionTime": None,
"databases": { prev: {"databaseName": (databases_mapping.get(prev) if isinstance(databases_mapping, dict) else prev) or prev,
"status": "notStarted",
"creationTime": created_iso} for prev in (requested or []) },
"databases": { prev: {"newDatabaseName": (databases_mapping.get(prev) if isinstance(databases_mapping, dict) else prev) or prev,
"status": "notStarted",
"creationTime": created_iso} for prev in (requested or []) },
"storageName": storage_name,
"blobPath": blob_path,
"externalBackupPath": external_backup_path or "",
Expand Down
2 changes: 2 additions & 0 deletions docker/granular/pg_restore.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,8 @@ def update_status(self, key, value, database=None, flush=False):
database_details = databases_section.get(database)
if not database_details:
database_details = {}
if self.databases_mapping and self.databases_mapping[database]:
database_details['newDatabaseName'] = self.databases_mapping[database]
databases_section[database] = database_details

database_details[key] = value
Expand Down