psw/borgmatic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add restore-path support for sqlite

Browse source
This commit is contained in:
Divyansh Singh 2023-06-15 23:02:09 +05:30
parent b7423c488e
commit 62b6f13299
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
borgmatic/actions/restore.py
View file

@ -316,6 +316,7 @@ def run_restore(
'port': restore_arguments.port, 'port': restore_arguments.port,
'username': restore_arguments.username, 'username': restore_arguments.username,
'password': restore_arguments.password, 'password': restore_arguments.password,
'restore_path': restore_arguments.restore_path,
} }
if not found_database: if not found_database:

4
borgmatic/hooks/sqlite.py
View file

@ -85,7 +85,7 @@ def make_database_dump_pattern(
return dump.make_database_dump_filename(make_dump_path(location_config), name) return dump.make_database_dump_filename(make_dump_path(location_config), name)
def restore_database_dump(database_config, log_prefix, location_config, dry_run, extract_process): def restore_database_dump(database_config, log_prefix, location_config, dry_run, extract_process, connection_params):
''' '''
Restore the given SQLite3 database from an extract stream. The database is supplied as a Restore the given SQLite3 database from an extract stream. The database is supplied as a
one-element sequence containing a dict describing the database, as per the configuration schema. one-element sequence containing a dict describing the database, as per the configuration schema.
@ -98,7 +98,7 @@ def restore_database_dump(database_config, log_prefix, location_config, dry_run,
if len(database_config) != 1: if len(database_config) != 1:
raise ValueError('The database configuration value is invalid') raise ValueError('The database configuration value is invalid')
database_path = database_config[0]['path'] database_path = connection_params['restore_path'] or database_config[0].get('restore_path', database_config[0].get('path'))
logger.debug(f'{log_prefix}: Restoring SQLite database at {database_path}{dry_run_label}') logger.debug(f'{log_prefix}: Restoring SQLite database at {database_path}{dry_run_label}')
if dry_run: if dry_run: