cli-backup 0.2.0__tar.gz → 0.2.1__tar.gz

{cli_backup-0.2.0/src/cli_backup.egg-info → cli_backup-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cli-backup
-Version: 0.2.0
+Version: 0.2.1
 Summary: Host backup CLI for database snapshots and directory archives
 License-Expression: MIT
 Project-URL: Homepage, https://github.com/XakkiDev/cli-backup
@@ -76,10 +76,10 @@ make cli-backup@verify path=daily where=local file=2026-01-01.example.sql.gz
 
 Additional targets `cli-backup@restore-test` and `cli-backup@restore` exist for MariaDB/MySQL. A live restore is destructive, requires an explicit file and interactive confirmation, and must target the correct stopped-writer environment. A restore rehearsal creates a disposable isolated container and should run only with appropriate authorization. For an unavailable source container, set `CLI_BACKUP_TEST_MYSQL_IMAGE` to an appropriate disposable test image before a rehearsal. Use `db=<name>` to filter when needed. Source-independent `list` and `verify` work with a stopped database container.
 
-To restore a backup from another project into this project's selected MariaDB/MySQL database, explicitly specify the source project and database. Stop writers and run interactively only with authorization; the confirmation names both source and destination. The destination database must already exist. This example reads from S3 without a persistent intermediary dump file:
+To restore a backup from another project into this project's selected MariaDB/MySQL database, explicitly specify the source project and database. Source and destination database names must match: SQL dumps can contain database-qualified statements. Stop writers and run interactively only with authorization; the confirmation names both projects and the database. The destination database must already exist. This example reads from S3 without a persistent intermediary dump file:
 
 ```sh
-make cli-backup@restore where=s3 path=daily file=2026-01-01.production.sql.gz source_project=production source_db=production db=development
+make cli-backup@restore where=s3 path=daily file=2026-01-01.app.sql.gz source_project=production source_db=app db=app
 ```
 
 ### Storage and schedule

{cli_backup-0.2.0 → cli_backup-0.2.1}/README.md

@@ -60,10 +60,10 @@ make cli-backup@verify path=daily where=local file=2026-01-01.example.sql.gz
 
 Additional targets `cli-backup@restore-test` and `cli-backup@restore` exist for MariaDB/MySQL. A live restore is destructive, requires an explicit file and interactive confirmation, and must target the correct stopped-writer environment. A restore rehearsal creates a disposable isolated container and should run only with appropriate authorization. For an unavailable source container, set `CLI_BACKUP_TEST_MYSQL_IMAGE` to an appropriate disposable test image before a rehearsal. Use `db=<name>` to filter when needed. Source-independent `list` and `verify` work with a stopped database container.
 
-To restore a backup from another project into this project's selected MariaDB/MySQL database, explicitly specify the source project and database. Stop writers and run interactively only with authorization; the confirmation names both source and destination. The destination database must already exist. This example reads from S3 without a persistent intermediary dump file:
+To restore a backup from another project into this project's selected MariaDB/MySQL database, explicitly specify the source project and database. Source and destination database names must match: SQL dumps can contain database-qualified statements. Stop writers and run interactively only with authorization; the confirmation names both projects and the database. The destination database must already exist. This example reads from S3 without a persistent intermediary dump file:
 
 ```sh
-make cli-backup@restore where=s3 path=daily file=2026-01-01.production.sql.gz source_project=production source_db=production db=development
+make cli-backup@restore where=s3 path=daily file=2026-01-01.app.sql.gz source_project=production source_db=app db=app
 ```
 
 ### Storage and schedule

{cli_backup-0.2.0 → cli_backup-0.2.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "cli-backup"
-version = "0.2.0"
+version = "0.2.1"
 description = "Host backup CLI for database snapshots and directory archives"
 requires-python = ">=3.11"
 dependencies = ["boto3==1.43.127"]

{cli_backup-0.2.0 → cli_backup-0.2.1}/src/cli_backup/scheduled.py

@@ -668,6 +668,8 @@ def main(argv=None) -> int:
                 target = args.database or (names[0] if len(names) == 1 else selected)
                 if target not in names:
                     raise ValueError('restore target database is not configured')
+                if target != selected:
+                    raise ValueError('restoring to a different database name is not supported safely')
                 prompt = f'Restore {source_project}/{selected} into {settings.project}/{target}? Type yes: '
                 if not sys.stdin.isatty() or input(prompt) != 'yes':
                     raise ValueError('restore not confirmed')

{cli_backup-0.2.0 → cli_backup-0.2.1/src/cli_backup.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cli-backup
-Version: 0.2.0
+Version: 0.2.1
 Summary: Host backup CLI for database snapshots and directory archives
 License-Expression: MIT
 Project-URL: Homepage, https://github.com/XakkiDev/cli-backup
@@ -76,10 +76,10 @@ make cli-backup@verify path=daily where=local file=2026-01-01.example.sql.gz
 
 Additional targets `cli-backup@restore-test` and `cli-backup@restore` exist for MariaDB/MySQL. A live restore is destructive, requires an explicit file and interactive confirmation, and must target the correct stopped-writer environment. A restore rehearsal creates a disposable isolated container and should run only with appropriate authorization. For an unavailable source container, set `CLI_BACKUP_TEST_MYSQL_IMAGE` to an appropriate disposable test image before a rehearsal. Use `db=<name>` to filter when needed. Source-independent `list` and `verify` work with a stopped database container.
 
-To restore a backup from another project into this project's selected MariaDB/MySQL database, explicitly specify the source project and database. Stop writers and run interactively only with authorization; the confirmation names both source and destination. The destination database must already exist. This example reads from S3 without a persistent intermediary dump file:
+To restore a backup from another project into this project's selected MariaDB/MySQL database, explicitly specify the source project and database. Source and destination database names must match: SQL dumps can contain database-qualified statements. Stop writers and run interactively only with authorization; the confirmation names both projects and the database. The destination database must already exist. This example reads from S3 without a persistent intermediary dump file:
 
 ```sh
-make cli-backup@restore where=s3 path=daily file=2026-01-01.production.sql.gz source_project=production source_db=production db=development
+make cli-backup@restore where=s3 path=daily file=2026-01-01.app.sql.gz source_project=production source_db=app db=app
 ```
 
 ### Storage and schedule

{cli_backup-0.2.0 → cli_backup-0.2.1}/tests/test_cross_project_restore.py

@@ -20,7 +20,7 @@ class CrossProjectRestoreTests(unittest.TestCase):
             artifact = root / 'dump.gz'
             with gzip.open(artifact, 'wb') as stream:
                 stream.write(b'SELECT 1;')
-            filename = '2026-11-11.student.sql.gz'
+            filename = '2026-11-11.student_dev.sql.gz'
             store.put(artifact, make_manifest(artifact, 'sa-prod', 'mariadb', filename, '2026-11-11T00:00:00+00:00'))
             cfg = MySQLConfig('exec', 'student_dev', 'root', 'secret', service='container')
             env = {'CLI_BACKUP_PROJECT_NAME': 'sa-dev', 'CLI_BACKUP_DB_CONTAINER': 'mariadb',
@@ -29,7 +29,7 @@ class CrossProjectRestoreTests(unittest.TestCase):
             def fake_restore(database, stream):
                 captured.append((database.database, stream.read()))
             args = ['restore', '--storage', 's3', '--file', filename,
-                    '--source-project-name', 'sa-prod', '--source-database', 'student']
+                    '--source-project-name', 'sa-prod', '--source-database', 'student_dev']
             with patch.dict(os.environ, env, clear=True), \
                  patch('cli_backup.scheduled.connection', return_value=(cfg, ['student_dev'], 'image')), \
                  patch('cli_backup.scheduled.stores', return_value=[('s3', store)]), \
@@ -37,13 +37,27 @@ class CrossProjectRestoreTests(unittest.TestCase):
                  patch('sys.stdin.isatty', return_value=True), patch('builtins.input', return_value='yes') as prompt:
                 self.assertEqual(main(args), 0)
             self.assertEqual(captured, [('student_dev', b'SELECT 1;')])
-            self.assertIn('sa-prod/student into sa-dev/student_dev', prompt.call_args.args[0])
+            self.assertIn('sa-prod/student_dev into sa-dev/student_dev', prompt.call_args.args[0])
+
+    def test_different_database_name_fails_closed(self):
+        with tempfile.TemporaryDirectory() as tmp:
+            root = Path(tmp); store = LocalStorage(root / 'daily'); artifact = root / 'dump.gz'
+            with gzip.open(artifact, 'wb') as stream: stream.write(b'ALTER DATABASE `student` CHARACTER SET utf8;')
+            filename = '2026-11-11.student.sql.gz'
+            store.put(artifact, make_manifest(artifact, 'sa-prod', 'mariadb', filename, '2026-11-11T00:00:00+00:00'))
+            cfg = MySQLConfig('exec', 'student_dev', 'root', 'secret', service='container')
+            env = {'CLI_BACKUP_PROJECT_NAME': 'sa-dev', 'CLI_BACKUP_DB_CONTAINER': 'mariadb', 'CLI_BACKUP_LOCAL_ROOT': str(root)}
+            with patch.dict(os.environ, env, clear=True), patch('cli_backup.scheduled.connection', return_value=(cfg, ['student_dev'], 'image')), \
+                 patch('cli_backup.scheduled.stores', return_value=[('s3', store)]), patch('cli_backup.scheduled.restore_mysql') as restore, \
+                 patch('sys.stdin.isatty', return_value=True), patch('builtins.input', return_value='yes'), contextlib.redirect_stderr(io.StringIO()):
+                self.assertEqual(main(['restore', '--storage', 's3', '--file', filename, '--source-project-name', 'sa-prod']), 2)
+                restore.assert_not_called()
 
     def test_confirmation_is_required_even_for_cross_project_restore(self):
         with tempfile.TemporaryDirectory() as tmp:
             root = Path(tmp); store = LocalStorage(root / 'daily'); artifact = root / 'dump.gz'
             with gzip.open(artifact, 'wb') as stream: stream.write(b'SELECT 1;')
-            filename = '2026-11-11.student.sql.gz'
+            filename = '2026-11-11.student_dev.sql.gz'
             store.put(artifact, make_manifest(artifact, 'sa-prod', 'mariadb', filename, '2026-11-11T00:00:00+00:00'))
             cfg = MySQLConfig('exec', 'student_dev', 'root', 'secret', service='container')
             env = {'CLI_BACKUP_PROJECT_NAME': 'sa-dev', 'CLI_BACKUP_DB_CONTAINER': 'mariadb', 'CLI_BACKUP_LOCAL_ROOT': str(root)}