borgmatic-collective/borgmatic
borgmatic-collective
/
borgmatic
14
57
Fork 41
Code Issues 53 Pull Requests 2 Actions Packages Releases 122 Activity

Fix multiple bugs in PostgreSQL hook #677

Merged
witten merged 6 commits from jirutka/borgmatic:fix-postgres-hook into main 2023-04-21 04:05:22 +00:00
Conversation 6 Commits 6 Files Changed 2 +2 -1
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 874fba7672 - Show all commits

3
borgmatic/hooks/postgresql.py
View File

@ -59,8 +59,9 @@ def database_names_to_dump(database, extra_environment, log_prefix, dry_run):
if dry_run:
return ()
psql_command = database.get('psql_command') or 'psql'
list_command = (
jirutka marked this conversation as resolved
witten commented 2023-04-14 22:47:53 +00:00
Review
Copy Link

Nice.. I didn't know about shlex.split()!

Nice.. I didn't know about `shlex.split()`!
('psql', '--list', '--no-password', '--csv', '--tuples-only')
(psql_command, '--list', '--no-password', '--csv', '--tuples-only')
+ (('--host', database['hostname']) if 'hostname' in database else ())
+ (('--port', str(database['port'])) if 'port' in database else ())
witten commented 2023-04-14 23:04:02 +00:00
Review
Copy Link

The addition of --no-psqlrc sounds more correct, but I do worry a little that someone will be relying on their ~/.psqlrc to be read. I guess we'll find out.

The addition of `--no-psqlrc` sounds more correct, but I do worry a little that someone will be relying on their `~/.psqlrc` to be read. I guess we'll find out.
jirutka commented 2023-04-17 11:53:52 +00:00
Review
Copy Link

This is not a hypothetical situation, it happened to me… borgmatic failed because I have \pset linestyle unicode and \pset border 2 in .psqlrc.

This is not a hypothetical situation, it happened to me… borgmatic failed because I have `\pset linestyle unicode` and `\pset border 2` in `.psqlrc`.
+ (('--username', database['username']) if 'username' in database else ())